From patchwork Tue Nov 12 16:25:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70323 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 8BA8927BBE9; Tue, 12 Nov 2024 16:32:18 +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=unavailable 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 1661E27BBE2 for ; Tue, 12 Nov 2024 16:32:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtnH-0004ki-1Q; Tue, 12 Nov 2024 11:31:07 -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 1tAtnD-0004hV-Gw for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -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 1tAtnD-00064a-8Y; Tue, 12 Nov 2024 11:31:03 -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=Oc2P0jK5/RRcqMUVYZ2cbyxGKxdzP3XZZrldqFy4ZN4=; b=eXJPOMn4hjbXcdxHS3PQBoZrQFnLU2VKveAF32F+T7pys0RyI7aD2A8M32gQ7IlRpj6X4JIgcdnLXgAYj5buERwGAZo9VMJneXty9ingYvy9CtyWXfAskEB9AgEkRd7zKejCr5iTKLN+9A92qegdm/wBmaEeLgvUpS64lQwwbVlpnnur9UiWr1ShtnU7M4zEtrP273jfm9hZNBPgaeIzm+73Yv56JcJYMhjPcVx0xOoUptJ5P19Ugni/JZZdDgkmPm56+Lfra2pi03QIy4IpRXro0dBRf+8GOMJKlOUvu6vcvShByciFqlkZ3wpn9yw2EWtk/QTi6yS4FXnrzTe7+g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtnB-0000cz-QE; Tue, 12 Nov 2024 11:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 35/40] gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:01 +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 , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290252241 (code B ref 74290); Tue, 12 Nov 2024 16:31:01 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:25 +0000 Received: from localhost ([127.0.0.1]:39247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtma-0000Zj-PU for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlv-0000Lb-UY for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:44 -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-0005Rg-Kh; Tue, 12 Nov 2024 11:27:28 -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=Oc2P0jK5/RRcqMUVYZ2cbyxGKxdzP3XZZrldqFy4ZN4=; b=eXMKpNQjGfYVd+FIIMca nXWCDllCCcE44EqJNIF2j522xFGsxqGR6vjyxp/EYGDBUDn5pr3tr4ARnMI7e9DaBpD9JdTwWuHZn NIVi4nshpykEQvG/WvAd5CmApz/eoVBDL90zfrc23eCgBJZT6bQr31fao9yfG80AQ/grcU/euWpAm Jg/OUfxFhN4qVv+eOAHX3Ry/Z2pw/tnuB5LpldQbOWiD/UAamXxHogx4NUxasNrE0jMInrX5TEvgX G9J/N94GKpbrYECFbhImh+8Tid6qcC6qqOASw6rR1unRIuSUTeLKDvUAtSRclc6S321+tXiUeErv2 yN8IX0hbnCg3xQ==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:44 +0100 Message-ID: <185134dc100369ffbf6362e9b8b1fb58ae9f8707.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/commencement.scm (libstdc++-boot0-gcc7): Change variable to... (make-libstdc++-boot0): ...this new procedure and update accordingly. (gcc-boot0): Update accordingly, and cater for x86_64-gnu. Change-Id: Ib0bc84e4dab90b080e5a01e6ab932f8be456c656 --- gnu/packages/commencement.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index aad3f523b5..b2558c0d54 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2274,9 +2274,9 @@ (define libstdc++-boot0 (inputs (%boot0-inputs)) (native-inputs '())))) -(define libstdc++-boot0-gcc7 +(define (make-libstdc++-boot0 gcc) ;; GCC >= 7 is needed by architectures which use C++-14 features. - (let ((lib (make-libstdc++ gcc-7))) + (let ((lib (make-libstdc++ gcc))) (package (inherit lib) (source (bootstrap-origin (package-source lib))) @@ -2447,7 +2447,8 @@ (define gcc-boot0 ;; The libstdc++ that libcc1 links against. ("libstdc++" ,(match (%current-system) - ("riscv64-linux" libstdc++-boot0-gcc7) + ("riscv64-linux" (make-libstdc++-boot0 gcc-7)) + ("x86_64-gnu" (make-libstdc++-boot0 gcc-14)) (_ libstdc++-boot0))) ;; Call it differently so that the builder can check whether