From patchwork Tue Nov 12 16:25:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70301 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 97FAA27BBE9; Tue, 12 Nov 2024 16:31:27 +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 5081927BBEA for ; Tue, 12 Nov 2024 16:31:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmN-0003gK-0H; Tue, 12 Nov 2024 11:30:11 -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 1tAtmL-0003ak-3h for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30: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 1tAtmK-0005sp-QU; Tue, 12 Nov 2024 11:30:08 -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=D6axnRuuFWwJiWnyEN9HXjAghrljwXYHqOHidrG8z+0Gvz3jt8oGHnus/814ZP1wfzeht5Bo+psFlWeCKbYp6jba00G9dzPfRER8F9WpmPwGe7IBk8zlMzMIAG2IeEjaDmH4zKNL38UBoDLHdyDrR0cM8mbGK+dJa+gjpFyVEho4ayp4kIWOjB8aCrOVmS9gc4Y6wYISDSGtXjtDKucuwHPFl9ets04QPx/Y4i4IEVcj/YggXwF+IjBP8imD2Q1/fwYkWN791gej2zMaGOdSHVsN8BPcR/zBwZiEIF7UFWAUNo/cLZ7bCDZ2X7wNoSeJL3e4rhS2rk7v7G6CWN+9WA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmK-0000RZ-KB; Tue, 12 Nov 2024 11:30:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 09/40] 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, 12 Nov 2024 16:30:08 +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.17314289631145 (code B ref 74290); Tue, 12 Nov 2024 16:30:08 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:23 +0000 Received: from localhost ([127.0.0.1]:39081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtla-0000IE-L5 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlT-0000GF-96 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:15 -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 1tAtjH-0005LK-CP; Tue, 12 Nov 2024 11:26:59 -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=VXi1pBlQeWCSjQpvJiTG 7dJrfK3C/HF3EUdxC6Ic9HWqOTeeBhXVAO09H0hBljyd5/xAy5nx7N5G29/MW1T6MHQlxnVhF4xd8 Y3gUWRJ+NRc4S3UghfVt5VlTj4JuihI9Q25rlcP2LLzwzRVHSHLJiOenF8fUdlnUebBhWd5FVsvR+ DM7pDeT6M+r/YXZ4ohb6fOnIxVPeMoG6GoxuPAdgXJYxW75owkQ8rkyEQD2fve8P2OxISX0inNtqX Vwaa07gBmJwOryQ0GE/rlaxtQL4xTCj+pzqbmkzOUIpLrvMmYun141Tn86RwAXwEud3ag9u8Dqu7v BrfPW+n89odFOA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:18 +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 _