From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp2.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id YIFPFd+CM2dNZQAAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 16:31:27 +0000
Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2.migadu.com with LMTPS
	id YIFPFd+CM2dNZQAAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 17:31:27 +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=D6axnRuu;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VXi1pBlQ;
	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";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1731429087;
	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=iklCoe7OWhf2nFj1OwESUYb76FX6v9OI4eCE6UYNwc4wxvuKoXZv9v7EmjNwtP6qiAzF5z
	WxhShMRqzTRMr/kT4r0VMX0TdOCM7gkIE4PrB8OIAguD0tWPY7vHYjQehpIol4UPccDtl9
	qyrNW9Vwd1OKz4HLRZstkn4iRt/+PJtr9M3I3w6PCQsxsPt7vw5OzGimfIEyU3zYl7PWxC
	2gMPAYT1D1x28fWdg3KtoFzyaeDDkIt8kgX6IAx7cSGpnHaMoZWNhc+QyFwbwONVfZYItg
	B+VgYqc0sC6ltXztmpRUigco2KM7xSS4aWHJEWfP5lYP7J6yJGnBTO4XruISdQ==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=D6axnRuu;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VXi1pBlQ;
	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";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731429087; a=rsa-sha256; cv=none;
	b=kr0F8ihL570lWeChMbY/M1B0QKxl1nsxGGYm2wV8jA/XxnuYoKDTy1rLVsUpU7X6bL25GV
	Ap6WDvC5tdw4HKGz1Sm3P8KsimSZgtnrtXAJzJtDBfu5S279ADYtOB7Vd8ORgRL+vXYx3s
	UCs8AvNVtw8Vb4aQyYablKqSJ98I6Iu2glafJx7mRv0BdpCT3sVR/oIBj0NqdY1eB6e4WD
	qlvhtmefIfSGkpdCKfK2kNE40u3GShT5P+3Sl8BHIG5UV0sjJX/M/fF3o5N4pNTaQ7nWL9
	Y+JQvCxImdKb7gDzyeLpmIFmkF32ztnBAExmEaRtnc3jmZimM8cPcPEnP+P49w==
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 3B10583085
	for <larch@yhetil.org>; Tue, 12 Nov 2024 17:31:27 +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 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 <Debian-debbugs@debbugs.gnu.org>)
 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 <Debian-debbugs@debbugs.gnu.org>)
 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 <Debian-debbugs@debbugs.gnu.org>)
 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 <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: Tue, 12 Nov 2024 16:30:08 +0000
Resent-Message-ID: <handler.74290.B74290.17314289631145@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.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 <debbugs-submit-bounces@debbugs.gnu.org>)
 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 <janneke@gnu.org>) 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 <janneke@gnu.org>)
 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 <janneke@gnu.org>
Date: Tue, 12 Nov 2024 17:25:18 +0100
Message-ID: <b83a4208f27678c4d86ad5c9983473bd74bf6ea4.1731427612.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731427612.git.janneke@gnu.org>
References: <cover.1731427612.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-Scanner: mx11.migadu.com
X-Migadu-Spam-Score: 0.88
X-Spam-Score: 0.88
X-Migadu-Queue-Id: 3B10583085
X-TUID: eozIaSzwvcQv

* 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