From patchwork Tue Nov 19 06:55:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70544 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 E161527BBEC; 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 AF41B27BBE9 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 1tDIDW-0000iu-LJ; Tue, 19 Nov 2024 02:00:06 -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 1tDIDU-0000ey-1D for guix-patches@gnu.org; Tue, 19 Nov 2024 02:00:04 -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 1tDIDT-0004Wr-Ip; Tue, 19 Nov 2024 02:00: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=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=dPFJ0Czgpp+4G0xYq7mNl8KJzuilKxKhIWVYB4/UcYbzrL8uYT8KRQuPGQ+gq0AgbCJFA2mhyZhx+rY0klP6tP8m7iCHBt/fq0h9UydHjSDXBnfc07u6sVwmjRJwow7h8B71hRHIpTbZHwQyOw1UYmZkKwnXqXNffS0KLOE1ksqHPF61wB+Hb5TnxOn863CTZNR7AsAK7OhAzMwX4FIyhnNwUs8XegUTzXJgjtINirmAwqdCWln5IUL9stdgeTZ2JM5s6/Iis0dPjuu17WYyvozGTDU06RyE/Pf/4gICAqgf3D53fkwd9FDQOhFuzACuZwMxQ4Nb0vHNuMjSTLwPaw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDIDT-0005O8-AR; Tue, 19 Nov 2024 02:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 44/51] 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, 19 Nov 2024 07:00:03 +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.173199958920559 (code B ref 74290); Tue, 19 Nov 2024 07:00:03 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:49 +0000 Received: from localhost ([127.0.0.1]:40653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDF-0005LR-0e for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICM-0005C1-7M for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:54 -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 1tDIAB-00046H-PC; Tue, 19 Nov 2024 01:56:39 -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=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=nsaRWQKAX7LYHek5/ACi kyYXfezIrvm/52OMWgch/isfRjNPYFPAxQqsfCFFLHd1WVZ++muXMAQ91ntB53laQZ/USEoCa/eW1 j9BpFAM+DeGkE3Gr3Yy7PBBjZE7yGIJQ6DibD0l4VWkSkd+DM2oewbT2w2KxWFpea21TLQOyD5woi FoM+uVEO8QICigDkPmfEvVXXylla64FBRgCy74O80+R98SlTr2ZYZo8DC5udaCeXiDMjCOPzhV7WT elQBMUeNft080Z857JLJyKs85Jo+P8dSL1gNHjZmFysC1X2bhmwrBGbF5AlB7kbbiHdXk5OgdaJy3 DsG0LCgYIi6qbQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:14 +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/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 ad70bae501..a14de3002f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2273,9 +2273,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))) @@ -2446,7 +2446,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