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 oO9zM3qNMGdvFQAAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 10 Nov 2024 10:39:55 +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 oO9zM3qNMGdvFQAAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 10 Nov 2024 11:39:54 +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=A5b2a6KL;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=W1DffoPO;
	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=1731235194;
	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=WIwtJqcY2lp73U+2B9jpUCxlRlIkLITEXKUAjgwFKr6J+JxbXTLbebSHMO4uQjiiAixdkE
	SWXpus6hJi+9I0KA3Sk5bpxP2Pc+SNJSX+MgwzpjLd1GEV8imwhR5euAziE241oTahfuQD
	gv5soOCFc/ht7srYC9T0hV+9QKNx2OfkFoKN3lpqjdClmXkP4PI6cznlmEIfXU1zsZXm9Q
	v13/p+vcj7VX1XLztuajtFqWvZslpqEj9SoqmuIteF5PChHAPvbGY+IJN/7sga6dngfX62
	ENybKJPaTLtHfheQwjK9K+jRW6P7M6n9jDiGxAHgCyE5GFTQFPW6UrbZ+qqjlA==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=A5b2a6KL;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=W1DffoPO;
	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=1731235194; a=rsa-sha256; cv=none;
	b=hslGBfM/QQmLwdw/XS3+k++vEAXI4B9QfPiID+5PqmQ+nISFehtUMRFYASpYrSB6wyN8a3
	7r4ID3PxtJrwphZKujT/L2zE2w4H6GkXZgSLU9ogy4FriguO5o2lfC0fZAH7zMozN0aT1f
	djjYB9azJr/CWcpT5rZ3+auTLPKKLw8X+hdPt8WzBbhq9tAs9qKfgiSDb9R/ShLR1GS2fq
	k5p/oQAyLDiHBygzUmxM2rMaqZ0xSJzmz36e7a25Z9GDtOf4PL4HHRvThJcQqEZe0nTsio
	JvUtpxIlOk6sOGFkqR7TLI+3wOIjFNsVUc2jXKYRwW6gELkXJzv99Q9lJB6mYg==
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 BD0647BCCF
	for <larch@yhetil.org>; Sun, 10 Nov 2024 11:39:54 +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 1tA5Lv-0000NW-MY; Sun, 10 Nov 2024 05:39:31 -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 1tA5Lc-0000A6-Af
 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:12 -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 1tA5Lc-0007uW-16; Sun, 10 Nov 2024 05:39:12 -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=A5b2a6KL2BN6QjjL1IWqr0KpjhPxNy9xof3UfXqJ2pCl4Ca/h1FoIxuyyB7CR2kBQ/bgqinfnXdHKW9Z3LQAzNCWVsFkydPszskKXt1e7mJYb1vL9AnsRqk+zf0ARNt2GLmGuwxsslMEcNXg6R7sdeOuTXNyYq5IOls50HpmeBm/zgTPHFsgwv+BOJxRHWe4TlHsqQn05cMWRT0hcDgjgK3+4adDtusWlVdILSCiuOfuiWHtBzgM3pqggp2AVVE6fhv0e8JicLmrm0HlfRzLSiPCDOtgu65rQeDNVUxWvQqvSx4ZDEBvHLiF35S4oip0sQ4kPSx6FEu4zvKRrqastA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tA5Lb-0002cY-P3; Sun, 10 Nov 2024 05:39:11 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH 12/31] 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: Sun, 10 Nov 2024 10:39:11 +0000
Resent-Message-ID: <handler.74290.B74290.173123514910039@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.173123514910039
 (code B ref 74290); Sun, 10 Nov 2024 10:39:11 +0000
Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:09 +0000
Received: from localhost ([127.0.0.1]:55729 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tA5LY-0002ba-Lv
 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:09 -0500
Received: from eggs.gnu.org ([209.51.188.92]:42278)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tA5LP-0002Xy-5e
 for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:59 -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 1tA5LJ-0007oj-W2; Sun, 10 Nov 2024 05:38:54 -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=W1DffoPOX/WepIvXC+49
 C183Ks44I6D28EVBOPDd+nrpI1RVNaRoeVzv1TWUeepAVYL/aDhEjXaKGuPIst1qDGz5+B6mAxeEC
 npTwIw9K/sy0HoUy1h6KFiqxHcOWUkTfEnkN0+TTmRGQyJFq4oHlPJECK8IDtwAEXrC0HoQL+0tpk
 4+enqP/e6QbWAXlOO9IS2p+pw1M4XfeE0siUIXa/rtiUWwD+JXf/Z05yPSJ85bLMvd58eNA1TYeeA
 9fU0oEzInYUhfc0ftZ6gIU8G6WkCMsW9oXGCDmejEAKDtWJ3/YbYX/OHwbTit9DM68Y8eAxBw990M
 rywLEmVOBoAR/w==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 10 Nov 2024 11:38:08 +0100
Message-ID: <1351fabb950e28169511b86e1e85fc197eac1674.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-Scanner: mx11.migadu.com
X-Migadu-Spam-Score: 0.88
X-Spam-Score: 0.88
X-Migadu-Queue-Id: BD0647BCCF
X-TUID: gO8cFE8ONmB8

* 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