From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp0.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id cGZHLUnlQmfDHgAAqHPOHw:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:35:21 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp0.migadu.com with LMTPS
	id cGZHLUnlQmfDHgAAqHPOHw
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:35:21 +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=pvob7yjl;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=gcTC9v2E;
	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=1732437321; a=rsa-sha256; cv=none;
	b=FLRytsTXB/jnSsPADCcpziY7c/BQJy1TNxeptIwOxt8kE2HPK63e7uY33UOC8bpqwfZitk
	S5To08encVoAY7ZdtS5IxMGqzIdaf4uddM17HLyS8CNNL1AD54FMqUBYdONMcj9093e/lj
	JY43tItyvXNrNEDbCdVb8O8krrkSZVdTKK+Za7KRaMI5XLqu8Jkx5ENxQemt6Dn9o3192m
	qs/IoJ8NCHz6zCTF5S2f8nJW3I1BZN6BZDLrJJLR0Jq/zJK8g3qtCtonrKhZGzlDfzcaPT
	gvQPeNbPQFTYFFgSD7lHxyTNu/qwA0ZHbumzT4hUyeBd4VM6fld0fZe23s8VMA==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=pvob7yjl;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=gcTC9v2E;
	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=1732437321;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to: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=jCJ0C5wf6WwpDPlRftOHTJMUCHlacoa1lsMC2E1/S1Y=;
	b=Gerls36JLCezQ6Bt9FJe1Nn8OQddPGNdy6Ghenn5CfznWvdmUZhuM9BMqUGPbksTXkFV2g
	z0l/SmluVwZXysBFGLXKD9/23uEdyl+MQxNyRx9235s/bs3lPCHsLnto5PIG1U1OI5DocL
	jZ9LYjX0Vyuzj7lm3mg38ZZN2rukzm5KjFXJuF1uV2i308RK/Ljs31jvV4QiWqjxTtOfY2
	crOr96ey2Nw5cgCyxxsrsujAKz0cQLSRu3VunEhkaE8WM/Hxa4TTIrVLNGctWDtqc+EFEy
	HaUF9RH9ICbvO7GlG3T+4hBegwuhdo6A2YMRYA6M/Q5Uba5pBSdJ3GvJ0SE+vQ==
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 69D2A79535
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:35:20 +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 1tF7Vk-0001Ji-G0; Sun, 24 Nov 2024 02:58:28 -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 1tF7Uo-0000SF-TP
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -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 1tF7Um-0002Py-JH
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:30 -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=jCJ0C5wf6WwpDPlRftOHTJMUCHlacoa1lsMC2E1/S1Y=; 
 b=pvob7yjll589zjQCxskUoke74c2fUoNymhbYQ5NM2Gg1brQ/BaZNgMTksMRTUwSwRCc4/eAibLH46AVpIFp1yIq4gozpC4qo3tz3DI6Isuv1Oa2tP67NqCKN/Nfszf2MRDX3AUF/dh1hIA3XGoSdJDVsivV6JIVzFah/M4e5TJvHGGNf/SOJS2cfqEFTahVzJzdHgTc08nSc9cKUiNDqMOYfxo0KnuePy6pL+3ggj0m4tVYJ1g3UK1WRTMndox/LuSzP3EnrOgvkAoJuXCGS5iqQdTHTqoHnsxvFNwnaZDhCocsVoHIX7x8UTK2SKUvQOBiwqVeGyJE5sEPzD7lMpQ==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tF7Um-0004n9-F3
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:28 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 42/58] gnu: m4: 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: guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:57:28 +0000
Resent-Message-ID: <handler.74290.B74290.173243503718205@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
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503718205
 (code B ref 74290); Sun, 24 Nov 2024 07:57:28 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:17 +0000
Received: from localhost ([127.0.0.1]:60859 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7Ua-0004jK-PX
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:17 -0500
Received: from eggs.gnu.org ([209.51.188.92]:55786)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7U2-0004b2-Oa
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:43 -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 1tF7Tx-0002G2-IO; Sun, 24 Nov 2024 02:56:37 -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=jCJ0C5wf6WwpDPlRftOHTJMUCHlacoa1lsMC2E1/S1Y=; b=gcTC9v2EbMq8Tswx/2uN
 4MLZ+ATn3c8QbXkpz+MDBjhzX/adgr4+vNSFmtmpftLEirn+tWNAJKbaWswZ0oeWauTbh/3z13G4/
 sk/7OkgWCpy7DV2ev44oQhqtTFTR2DU9O2tJn9ZB+hqnUitz2jsSt2CtYLmFXXqqtC/L9dauQFeV5
 bL76zz0rJXyUvEPc625Dlf1NpR+pI3B9FQ+DD813Z3NYkMrZ3raHxNppdLToEPhT2qyrKo5U1JiEx
 EwQxyAGl+m22P1cTJvKsYSI+Gig/VkoQw5UVO5jpBA997kigtWS4wyfGJSVLQaUDsBI6fdm49Hu0A
 9E4pzgrQnTsPdA==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:55:05 +0100
Message-ID: <4c8ab0e1115b295761e5fe5ec4b9a3a1c06d6d00.1732434271.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732434270.git.janneke@gnu.org>
References: <cover.1732434270.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-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Queue-Id: 69D2A79535
X-Migadu-Scanner: mx13.migadu.com
X-Migadu-Spam-Score: -7.67
X-Spam-Score: -7.67
X-TUID: 8JAKujrycgsn

* gnu/packages/base.scm (grep)[arguments]: When building for the 64bit Hurd,
add patch-sigsegv.h stage.

Change-Id: I82993ebde268867348893556a9476faa5c4e9453
---
 gnu/packages/m4.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm
index 39b50b6800..081304db34 100644
--- a/gnu/packages/m4.scm
+++ b/gnu/packages/m4.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,6 +64,13 @@ (define-public m4
                       (("(^| )main *\\(.*" all)
                        (string-append all "{\n  exit (77);//"))))))
               '())
+        ,@(if (target-hurd64?)
+              '((add-after 'unpack 'patch-sigsegv
+                  (lambda _
+                    ;; Stack overflow recovery does not compile
+                    (substitute* "lib/sigsegv.in.h"
+                      (("__GNU__") "__XGNU__")))))
+              '())
         (add-after 'unpack 'configure-shell
           (lambda* (#:key native-inputs inputs #:allow-other-keys)
             (let ((/bin/sh (search-input-file (or native-inputs inputs)
-- 
2.46.0