From patchwork Tue Nov 19 06:54:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70545 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 0058427BBE9; Tue, 19 Nov 2024 07:01:16 +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 A2BA427BBE2 for ; Tue, 19 Nov 2024 07:01:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICf-0008Le-1h; Tue, 19 Nov 2024 01:59:13 -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 1tDICd-0008KN-Ci for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59: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 1tDICc-0004JE-Pk; Tue, 19 Nov 2024 01:59:11 -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=T19QnWowoXRbHn6zOce4PtrHA8/fsqeNXlM6LX2+S7ghsb4odHDN+wZiTPdUAHfl29IWiwveoq/2u15g7EtXcEaUveoxY+ZlkCt3uZFxpH68CazV33kqBlzwiX05Ry5eSUExu+WPiFrTt76S3gkVqG6gd+jcEqrMHoj/8ShzLrCRyVCa8xZ1HyIB0e3ES0qLPYGjVvVFifiqtV1I/CdahGkcVYmmzjtmBIfhbVY/82d3ciU7E6pzyqkaI9bgaH1OgmUAf/L15brdJ4dsDMMolpNnnrWIB0T6+P2ltNCWgnh25pkEvPn/o8HymHZhW0es8r94XuX+a31iP0L7u0KEfA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICc-0005GI-JO; Tue, 19 Nov 2024 01:59:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 11/51] 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, 19 Nov 2024 06:59: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.173199950419745 (code B ref 74290); Tue, 19 Nov 2024 06:59:10 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:24 +0000 Received: from localhost ([127.0.0.1]:40463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBs-00058H-C1 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBj-00055s-A0 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 ) id 1tDI9Y-0003xe-Bh; Tue, 19 Nov 2024 01:56:00 -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=mBH28XVLbbqosoCtFVnj h3kCDTgw8yb2A2Wym9uZQfRs2aAuPuG53/iEEepgf9QoXU7gUorbYZ3rbCtfpEx7++oF13tC5TlKF 270OWMDpVO4DZwRw9qdke9QxheEW3sOhejl7HO1Q6heA7SSgD+5aeGvNfVi9C1maoLB9EyPmr3ev0 o++Z2yhImzLpPB9BsLSiM39D+6dhdKgjg0AmPhV2xZqYum7+IyK5CEhezHzPO7gvS6Sz7OOUHXrd6 V1bAdA7uzqyRXfPKWWxBJuQSMcoVWD5rQdVZwR4zOi111OtwOhjBtbVuEfn30g9/fStdxuCMgkNQH vHROxVxUf2Py9g==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:41 +0100 Message-ID: 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 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="