From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 +Db8KTHlQmcJYwAAe85BDQ:P1 (envelope-from ) for ; Sun, 24 Nov 2024 08:34:57 +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 +Db8KTHlQmcJYwAAe85BDQ (envelope-from ) for ; Sun, 24 Nov 2024 09:34:57 +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=EQWgAfz9; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="IDPQp/ck"; 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=1732437297; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=a7NmOy2KfV6cY0d2ca/CXJoA0Tsq6JjKypPbOUHOUhw=; b=JNO+H4HZrD4xTOSSYWx5vPHEuHPWilQ7VjFBxdwqa7olk6dZ/swZj5eYqhcnyGu5k6TlUN rcff2sAKqtElyrHAeSrktOhBrz/2byBwZJ39H+KsEGorwK1PLyoOTexCJurByhA/++s9Ns wouw+McKp6eRHikj58tPD8hdVx0QUNYE9P1qiW7JUeIvlHhTw8O0SuTt3Zd4cSflvF6udQ oplIffbSf2vhRSqjxYsMNcsvBn0WtBzA2B8+VByEkF67LpVJpJBomXnJXJAscVpOLwrR5i UKvt+68YIYZX2J7nqmMeW56pZqmmKFmErniBfx2k8qNDX9YYNKu4kYtLqZg1NQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=EQWgAfz9; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="IDPQp/ck"; 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=1732437297; a=rsa-sha256; cv=none; b=OQXRHcovvRS6nlQdblDtO938MRK7yPTe8H9h3apodaK6xn2KaBFJHF0uNPLffvg4ejoPOb OzVlWGFvmYPkzBwwufGqSS+LCPvyrXRSb6y5yXgNqOcFYZreI19sjn2Spd77qxwoSe0qpf 6/jDchEFRXY8DR5C07m+kyl83ieF7PbvW7yVVR+FmamP4ZyD5szOVMheOwgXY7wiEM4qET XaqbVuve2cDw/TqhsOFF1y5BOAXppsjG7p9d29/H1d+2Y6mySd3pV9geTE3NY4wsrKD8dJ mPs2uEQW1xpYE228+Y6m5Hqexpy9GZRMYpJg5bUa5TBIrY0sNTDYlRrwrVLAEQ== 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 8FB267C31E for ; Sun, 24 Nov 2024 09:34:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7US-0000CM-9M; Sun, 24 Nov 2024 02:57:09 -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 ) id 1tF7UQ-0000B1-T8 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:07 -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 ) id 1tF7UQ-0002KZ-Df; Sun, 24 Nov 2024 02:57:06 -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=a7NmOy2KfV6cY0d2ca/CXJoA0Tsq6JjKypPbOUHOUhw=; b=EQWgAfz9wAQso6xJpLM4kEbDs/inBiuzLhKj97oTcF3pRpgrU31q818604p7PnrV3y/aZ2c6lTyVReaeLRs58HepQy5B4R2hEt26UkBpaMSTTfqNDCWLigZJhuGCEkba5fyomHpTgizDy1c6FL56Dhby13ynKZNAhVuO/ILMtFsL1sENDhFVCvZTI02wN05iDLnbxfATGnsqHFwyxomFxeXjCRwn+yi3qpSCucf3elKn22GHGnx1kUY4WVUntxoYe2x6cLTtXph+Zoi0A56/aKn58N1gKNhZdrALbmEh7HNWeSs536u3qxp33OmUALWbTrQ2DFYGr/yD5D/6fPgGdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UQ-0004fq-79; Sun, 24 Nov 2024 02:57:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 11/58] gnu: libstdc++: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:06 +0000 Resent-Message-ID: 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 , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497417476 (code B ref 74290); Sun, 24 Nov 2024 07:57:06 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:14 +0000 Received: from localhost ([127.0.0.1]:60681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TZ-0004Xb-P8 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TS-0004Ur-93 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:06 -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 ) id 1tF7TN-0001v6-2X; Sun, 24 Nov 2024 02:56:01 -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=a7NmOy2KfV6cY0d2ca/CXJoA0Tsq6JjKypPbOUHOUhw=; b=IDPQp/ckNmHado+R6ZI7 pX9rm5FdCHs7kaEunE32nkQ85lkmyVeJILBD8m8MiPp1IeG9/DeodpHwwawnz/OVKWA6Eu0DVGoVD spq0Owrpw8htoKWQuLlI08m5NbVtesv8XQKQg3qg7NU6F6iLgcqGhJMdeNpITcuc0089GYx54TbyR xCTrzw3E0bcRyNEo+130ymH23FI9FEzRttxSggXpAwePONPvmDRVG20gE0W5aNIr+3tMWyI4/T5uH yCiiH34xzLhrGc71LpxpGK/xzHXUcNRMjOjEsHAKeLhE5JPom0dde/QVlez3d3xC4aYBVXbE4UVOX f5wWksLtw6z+jQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:34 +0100 Message-ID: <7747b95f6a663fee3fa27e2c2188b48abf466077.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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.33 X-Spam-Score: -0.33 X-Migadu-Queue-Id: 8FB267C31E X-TUID: PTrUPne/K4fr * 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 c9e475b676..64ba37fd69 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1024,7 +1024,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=" -- 2.46.0