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:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id oPK9McuCM2cVVAEA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 16:31:07 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id oPK9McuCM2cVVAEA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 17:31:07 +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="v7aDEx3/";
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=DOZPS83n;
	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=1731429067; a=rsa-sha256; cv=none;
	b=uRh6hbLX8FTU8O0lPGF0mVNaITZxnIxIWsHIujYjHclYgtguDKRiNGLsL43nBrIcqyGofk
	UK6MEM+LtqIH2p4XDNdhvOA4xG0NNaYBcLkABjBx/LfwnisAoVlSRJO60j8rPA7TnJVmW/
	xiyFdi6Xp2hCSRvU87RG/VusTnucYse9+QCyqF43nQPPPVIdkYmu8O8h9Or1aafEZrdGLH
	e6qjHJdq2cCbMLFz6jAQ83vK9JayI0DE+a5Sc8vcA75t4TP9PPaJPl66Pz7qE+3KPPwlXx
	hTzj5EDaNB7OE1Xg+yMlNs2+tMIdf1KVE/1ewKnyMRR0ZDHdrnF/uHD/mpMhPw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="v7aDEx3/";
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=DOZPS83n;
	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=1731429067;
	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=pm8WZDRbhwfLn8ytzU4EtmSzH6LGbPoUL3FvdFoUW3E=;
	b=AJBS51ucZCZirYKgIAePkFPAPnm1gN2/zNVgBAJNjPgE0rDGMMCuNQ8+VRu8wbJysR7tdF
	9TwHW9T0nuiE8S+AwgdcV3Hgn06huNAUDk7sWQrsvWHnTjawt5uDbfxSasZT6ZlDGwtpl7
	nPnlpC9Kb+dHlYo8YIyPu4fmB55Mcj/Jek+TQZuuxU6oSFiq1zY2mGdoaXbABHWOYD3NZM
	1ARFpkM0SAgPzUkPkE3UWM8lfb8haPeMwKMjvTyCOz6CFzAMhtXP8/Gcx9JyJKuGEFvBnI
	I4RT4+q1ObW+Htv9yZ2oDuwIx6nc0TLEneqbyDkhnewj2a3UY+ZuZxZtZFRLYQ==
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 A184965A6C
	for <larch@yhetil.org>; Tue, 12 Nov 2024 17:31:07 +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 1tAtmQ-0003ns-7X; Tue, 12 Nov 2024 11:30:14 -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 1tAtmN-0003gP-4b
 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30: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 1tAtmM-0005tQ-P6; Tue, 12 Nov 2024 11:30: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=pm8WZDRbhwfLn8ytzU4EtmSzH6LGbPoUL3FvdFoUW3E=; 
 b=v7aDEx3/w5nfTBNEwoQMZ+Vmq4g7nJZF5hFEdB0DF6G5xgzWV4+bTNwbxrahHD1OymBUDvoke8FuS6Gd1xmxj5S0M6FdiIBMIjukocTIZIZ+yrv7llFQBtv07L9jWtvvTTJ4EWY6dLm+6uDj4I1ngHMHb4esb4QolSQA7fAKo9LBN3jocVZRGo03w28uelqjc3fEgu4SWUVpp5wB4/M/Ni1vWRcTiceY3OQFeiLfyINjP/Xnc8+GaAtkR7aGrNux5AaISBMGIWkxXulvSC790vzATjiAum/+kepylO74S7n+OAv2vklBM+wuiF4M8mEfmQyRqoOrD8csc2NAFjttsA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tAtmM-0000Ti-IC; Tue, 12 Nov 2024 11:30:10 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v2 12/40] gnu: libstdc++: Support 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:10 +0000
Resent-Message-ID: <handler.74290.B74290.17314289711215@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.17314289711215
 (code B ref 74290); Tue, 12 Nov 2024 16:30:10 +0000
Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:31 +0000
Received: from localhost ([127.0.0.1]:39101 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tAtli-0000JV-MA
 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:31 -0500
Received: from eggs.gnu.org ([209.51.188.92]:47686)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tAtlV-0000GJ-Ab
 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:17 -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 1tAtjK-0005Lr-FJ; Tue, 12 Nov 2024 11:27:02 -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=pm8WZDRbhwfLn8ytzU4EtmSzH6LGbPoUL3FvdFoUW3E=; b=DOZPS83njX+ZCzYDQIDD
 P54+28rzz4UZGmazBaolWdFq0eKTgnZWLcoKSFJLf1Vu67RhTX+kPisLFS4bOziZVS6uPV9M+bbf2
 rO5Iu99X7+rHBGMk+CVVxnAuBBDoOfjquIsSJz0EkD8fh7KFAsgdXztTdPPYoyV2jADRXYQCiE9zE
 UtC1nSOPjiCE3UyYhYkRrx1LKjnBOH0PB/GXvcFSznrLs8U0vSs4v0O/ltLHwEJREzhKLZGgv//SH
 HZ1ABNBTtVcepfh/m5sUXCcv7iPB9H7tDE2Q03/J7pAqVDrI5ydMWVMU4skV7I5la6cMy3eQFB6Vc
 7feOYYDjXtq8yw==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 12 Nov 2024 17:25:21 +0100
Message-ID: <7d1dafc36c5b23a342dced99c93cd8033a3bc852.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-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: 1.38
X-Spam-Score: 1.38
X-Migadu-Queue-Id: A184965A6C
X-Migadu-Scanner: mx12.migadu.com
X-TUID: LwwnnaQ1iOBu

* gnu/packages/gcc.scm (make-libstdc++)[arguments]: When building for the
64bit Hurd, add stage patch-hurd64.

Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602
---
 gnu/packages/gcc.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index fc3746fb05..850a14cb1c 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1033,7 +1033,15 @@ (define-public (make-libstdc++ gcc)
                   (("/lib64") "/lib")))))
           (add-before 'configure 'chdir
             (lambda _
-              (chdir "libstdc++-v3"))))
+              (chdir "libstdc++-v3")))
+          #$@(let ((version (package-version gcc)))
+               (if (target-hurd64?)
+                   #~((add-after 'unpack 'patch-hurd64
+                        (lambda _
+                          (substitute* "libstdc++-v3/src/c++20/tzdb.cc"
+                            (("#if ! defined _GLIBCXX_ZONEINFO_DIR")
+                             "#if __GNU__ || ! defined _GLIBCXX_ZONEINFO_DIR")))))
+                   '())))
 
       #:configure-flags '`("--disable-libstdcxx-pch"
                            ,(string-append "--with-gxx-include-dir="
-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | AvatarĀ® https://AvatarAcademy.com