From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp1.migadu.com ([2001:41d0:403:4876::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id eN41KHWNMGda9AAA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 10 Nov 2024 10:39:49 +0000
Received: from aspmx1.migadu.com ([2001:41d0:403:4876::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id eN41KHWNMGda9AAA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 10 Nov 2024 11:39:49 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=cYz8qxc+;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VhuMbHSX;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731235189; a=rsa-sha256; cv=none;
	b=P6nGf3Uqco4WDKRFE8b7K94T9qbkH3owiezH54hECf22pT2QOSGsuaodPlh5I/kNY22fE7
	TWx7PHUOFnwmvS4P5AN+TW87Vvf4BtHU6DxqzZ8Ys9cOi62fFqFj6RIZ15Bgd5gEV954FT
	rSrKdsbBw5wRhSAz1AMNepPIG+FH+XwPz/pQ8+UjpsumEeOI9x0ytAcI75TzhDO4LP0aaG
	y31yxtRpatub7T6n01ZXT10xFCkP0nDD6+Wx9tJ4pFRSzq+RysAzAdW9pQc6RdM8YBzx9O
	IHuesVsdWAOH27kJq8Oc+ivmb2q70BKqGSGzS0QUHFR6KJOaOznFONf+soYEBA==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=cYz8qxc+;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VhuMbHSX;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1731235189;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=h55XCVacEinh6pSFBtQQDI+SpliB5ZpcZDJ89ZZyWL8=;
	b=IeO+oERAzZGb9D19KrZyxsy3aLXkWHQDC5aD51brEO6Tsz3y+dXvOBVaaAkijNx8tn6DeQ
	CtGKCedwLpa6QJ0S/W1+eN9adKb6fBAGGDnWeODAfQssMRiIfYwv0LoiFJeq6ZqRceGnNC
	Hcl0gA5qhkE06o+CbwkR6RizQG7nBYjBFGpZXsIvVV40/x/De6OmkQMWYTu4NG1r1dklMF
	NPd8tLECr3mnvb7nAtc+JI2wyIM6rmX8yF37PYAkMU45ZrY8Mw8E7DTy9LqqTsQcDW2CKN
	PRzja8Zwzg65V4/sUGmmQ2AH+sc9x+DM8zv9nEqNGgLYFqg2PItjVB9jTTcVJg==
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id 8FD8D79935
	for <larch@yhetil.org>; Sun, 10 Nov 2024 11:39:49 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	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 <Debian-debbugs@debbugs.gnu.org>)
 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 <Debian-debbugs@debbugs.gnu.org>)
 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 <Debian-debbugs@debbugs.gnu.org>)
 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 <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
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: <handler.74290.B74290.17312351469977@debbugs.gnu.org>
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 <andreas@enge.fr>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
X-Debbugs-Original-Xcc: Andreas Enge <andreas@enge.fr>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
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 <debbugs-submit-bounces@debbugs.gnu.org>)
 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 <janneke@gnu.org>) 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 <janneke@gnu.org>)
 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 <janneke@gnu.org>
Date: Sun, 10 Nov 2024 11:38:05 +0100
Message-ID: <ae7a6ed0238a5a9f669d05335f7c9547ec368a7c.1731232753.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731232753.git.janneke@gnu.org>
References: <cover.1731232753.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Country: US
X-Migadu-Flow: FLOW_IN
X-Migadu-Spam-Score: -2.56
X-Spam-Score: -2.56
X-Migadu-Queue-Id: 8FD8D79935
X-Migadu-Scanner: mx10.migadu.com
X-TUID: l/vA3Gp/m8Tf

* 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 _
-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | AvatarĀ® https://AvatarAcademy.com