From patchwork Sun Nov 10 10:38:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33222 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CC9A227BBE9; Sun, 10 Nov 2024 10:39:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6CC5C27BBE2 for ; Sun, 10 Nov 2024 10:39:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Ly-0000Q6-3L; Sun, 10 Nov 2024 05:39:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tA5La-00008U-Va for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:11 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tA5La-0007th-8Q; Sun, 10 Nov 2024 05:39:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=h55XCVacEinh6pSFBtQQDI+SpliB5ZpcZDJ89ZZyWL8=; b=cYz8qxc+2jOW16bC2SsnGdzmzFRuVqfUkx/sRDlDpKXr3agGv13VV7YLWe5c4Ik35ykNNpYsf3g2Xot+XoZk/ud37mfR1FPsSyjF45YRStMo9Wcqjwj5MbB9HQE1sWLGIYJALZ93il31gsVVXrLHXgF1O6jXjMlajpKPu+GMp+1UbsH+fN5epT7iMxTsAZ9N9H3DyMg53LsFWEclVyNx/NM7B7+iOOau1pEFxpMIQzAdFeC4EaMyp8roWxe4Th87EV9AzSfrRr3Ai+cASstR+Syw0BujKz5jA6YURYWGohU6tqWztb0Hspf/K0f0lX54uCsWg9UfH3Oy8XjhOHPbpw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5La-0002by-0w; Sun, 10 Nov 2024 05:39:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 09/31] gnu: grep: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17312351469977 (code B ref 74290); Sun, 10 Nov 2024 10:39:09 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:06 +0000 Received: from localhost ([127.0.0.1]:55714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LV-0002aY-Pd for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LL-0002XR-Ua for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:56 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tA5LG-0007o9-OF; Sun, 10 Nov 2024 05:38:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=h55XCVacEinh6pSFBtQQDI+SpliB5ZpcZDJ89ZZyWL8=; b=VhuMbHSX0X3DYs1KOFJk TRkfOjtlcsoSMOQwlVHb7nr5pjW65vBBfonh1m+m8GfhXJ2B/vJeEmGBzp2H/pmmh6F1sj7M+Y/yR TB2ZV//fCn2OIZcG99lYQ4RJHODBAB/fRLj6iHJCnpmsJGtrzXbdmz8Re54qMZVWM2pm30/gO6Ic9 8sJC8J4G6Q+hxJTnEzxE37/GMB1LKIWxy5XuMo6Hc+qooc3CN+oBVPJcQ69bue31/Mxgs/W0EKs8k RdauEjoHdr9n0Xi58i6uZ48ToAxZ+iBdoynlpK/LiwqBGUHJE7Hl5awPTVl/PX+inSY4hre+XV/GO 0bOhRahHC+1PWA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:05 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/base.scm (grep)[arguments]: When building for the 64bit Hurd, add patch-sigsegv.h stage. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/packages/base.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 02ef71f20d..010be631d7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -154,6 +154,13 @@ (define-public grep (string-append bin "/fgrep")) (("^exec grep") (string-append "exec " bin "/grep")))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'patch-sigsegv + (lambda _ + ;; Stack overflow recovery does not compile + (substitute* "lib/sigsegv.in.h" + (("__GNU__") "__XGNU__"))))) + #~()) #$@(if (system-hurd?) #~((add-before 'check 'skip-test (lambda _