From patchwork Tue Nov 12 16:25:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70296 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 94A9D27BBEA; Tue, 12 Nov 2024 16:31:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5D68727BBE2 for ; Tue, 12 Nov 2024 16:31:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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 Original-Sender: "Debbugs-submit" 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: 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?Co?= =?utf-8?q?urt=C3=A8s?= 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 ) 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 ) 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 ) 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 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: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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="