From patchwork Tue Nov 19 06:54:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70521 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 0877827BBE9; Tue, 19 Nov 2024 06:59:59 +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,URIBL_BLOCKED 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 BBA5227BBE2 for ; Tue, 19 Nov 2024 06:59:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICe-0008Kl-7C; Tue, 19 Nov 2024 01:59:12 -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 1tDICb-0008J3-HQ for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:09 -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 1tDICb-0004Ik-8C; Tue, 19 Nov 2024 01:59:09 -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=vLwAI3pRadCOc+xAtqkPxBUO3GXJJJLG0R5f3eTwliQ=; b=YJ1GVbu0soOufMbIKsRCnNx3FnWLyyiGvZHfE+1VBDgc39wMtY6Lj7mo+MnZEsj7HqSvb+RQBgAI/Xcb0O9cLxd2iUdDCbtS9nJDdoRx9sX8FTjCkmbVcgp0Z03cxkGxgWREBtJXEeb3KhmgHLjJLvQ03r6vEPFmeKHkKRnMQsNhH3uLw674C4vt8Iysv/zMajzatt84maa2wVDgJcMfhtcTHCvRsL5VQJBVMpWpsFri/qU3A0J6r6PQqcm6h0izCBqZW9f/XNc3isJlvwnJ9hvIERZXfnMnwBRM5iVqyT0ghIwNCXtYCrv6UuBn3QgCqZT1qnPsz7YX9L24t1Yvsg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICb-0005Fr-2P; Tue, 19 Nov 2024 01:59:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 08/51] 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: Tue, 19 Nov 2024 06:59: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.173199950319716 (code B ref 74290); Tue, 19 Nov 2024 06:59:09 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:23 +0000 Received: from localhost ([127.0.0.1]:40455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBr-00057q-8z for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBh-00055d-8F for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:13 -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 1tDI9V-0003x1-DF; Tue, 19 Nov 2024 01:55:57 -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=vLwAI3pRadCOc+xAtqkPxBUO3GXJJJLG0R5f3eTwliQ=; b=jDAq7ewm7VGW9IbBO9xT 6dWEUoPad6h7/O0T1gFr8PvhkyUVNM8+g74iHx8Svqb/r9bD/rXwptDX5pVUk5XnVBd64o00MoHTS 4aWId3GnRUpLkQKUtjtEQqfS2ynLXsaa+cMUeT+4/WJVfIG+ltg1DI6hr90P+UliY+DDiiMSMm+XP pRFYwNS/DWymEDN67LzCx+l9wBmBlmwqLZYRlq+K9pUA6FruImmoSo3oxqsUDgNE3qQHXMQRrRXYe Rtl3pGmmNWPostBAzFSHi0xL6IxoaWz1H7ARjoB3ptqPfu0AksL12pjS2EnKsyeikK40DwjoOy6ot wRyGsDuECnfewQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:38 +0100 Message-ID: <33e729f2ea5e62c16279d6ce1b9bb2a1f3ddeb6e.1731999203.git.janneke@gnu.org> 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 _