From patchwork Wed Apr 3 19:26:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 62682 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 CBF8027BBE9; Wed, 3 Apr 2024 20:27:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 4AF6027BBE2 for ; Wed, 3 Apr 2024 20:27:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rs6GF-0001rb-7z; Wed, 03 Apr 2024 15:27:03 -0400 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 1rs6GD-0001rN-6U for guix-patches@gnu.org; Wed, 03 Apr 2024 15:27:01 -0400 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 1rs6GA-0000FU-Q1 for guix-patches@gnu.org; Wed, 03 Apr 2024 15:26:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rs6GF-0005x9-9J for guix-patches@gnu.org; Wed, 03 Apr 2024 15:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63393] [PATCH V2 1/2] gnu: gcc-toolchain: Do not use gcc-final. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 19:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: Isaac van Bakel , Simon Tournier , Kaelyn , 63393@debbugs.gnu.org Received: via spool by 63393-submit@debbugs.gnu.org id=B63393.171217239622731 (code B ref 63393); Wed, 03 Apr 2024 19:27:03 +0000 Received: (at 63393) by debbugs.gnu.org; 3 Apr 2024 19:26:36 +0000 Received: from localhost ([127.0.0.1]:59695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs6Fn-0005uY-No for submit@debbugs.gnu.org; Wed, 03 Apr 2024 15:26:36 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:36299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs6Fk-0005tf-GC for 63393@debbugs.gnu.org; Wed, 03 Apr 2024 15:26:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1712172380; x=1712431580; bh=uQmJRt7A4Ukn8H1R970IlC6xYPnwlHdG3VBV7NnIbAE=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=YOH+qUZKIx09y7QhpG8uTlSnpAR0I7o+ED6lBwM1d/2aXybU/zhHb1pa9RWb0pWxr ZdXY+hjZlQ6d2DCwtPRzMch94u4NNCrt2sOelaxGpjp3Jb7y+8OR5qDUbBe0C/8/Pf uOAhvpmeuO9ZW356G+jkZk6O6jffcgsJF5WpPrEpROPQ04lJ0eWw7K8QoUWxunUc8G a7/2dOl5IfuD77zwkFgfqfnjYmgwVUF5Pg9V+1RBE5E4VPI4awMqbgYZiTHFw37uVt cF29lPObvznL6UXlv66q15qwxZOPkdJ/P2liDDqCbttjGRVbmJG7seKcSaGQ9v2yQ3 GBUpBwDXCEE0g== Date: Wed, 03 Apr 2024 19:26:10 +0000 Message-ID: <878r1uw8ms.fsf_-_@protonmail.com> In-Reply-To: <87bk6qw8th.fsf@protonmail.com> References: <87sf9nzoxf.fsf_-_@protonmail.com> <87bk6qw8th.fsf@protonmail.com> Feedback-ID: 7805494:user:proton 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: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias 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 Empty Message From d12383158b58d558ea98a61ea99f17b991c4231b Mon Sep 17 00:00:00 2001 Message-ID: From: Simon Tournier Date: Tue, 9 May 2023 19:04:04 +0200 Subject: [PATCH 1/2] gnu: gcc-toolchain: Do not use gcc-final. * gnu/packages/commencement.scm (gcc-toolchain): Bind to the default gcc-toolchain-11 being consitent with others. (gcc-toolchain-11): Make it from gcc-11. (gcc-toolchain-aka-gcc): Bind to gcc-toolchain. --- gnu/packages/commencement.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9124f0e2e0..390bdad250 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3616,8 +3616,6 @@ (define* (make-gcc-toolchain gcc ("libc-debug" ,libc "debug") ("libc-static" ,libc "static")))))) -(define-public gcc-toolchain - (make-gcc-toolchain gcc-final)) (define-public gcc-toolchain-4.8 (make-gcc-toolchain gcc-4.8)) @@ -3644,7 +3642,7 @@ (define-public gcc-toolchain-10 (make-gcc-toolchain gcc-10)) (define-public gcc-toolchain-11 - gcc-toolchain) + (make-gcc-toolchain gcc-11)) (define-public gcc-toolchain-12 (make-gcc-toolchain gcc-12)) @@ -3652,10 +3650,14 @@ (define-public gcc-toolchain-12 (define-public gcc-toolchain-13 (make-gcc-toolchain gcc-13)) +;; The default GCC +(define-public gcc-toolchain + gcc-toolchain-11) + (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package ;; automatically "redirects" them to 'gcc-toolchain'. - (deprecated-package "gcc" gcc-toolchain-11)) + (deprecated-package "gcc" gcc-toolchain)) (define-public gdc-toolchain-10 base-commit: c9cd16c630ccba655b93ff32fd9a99570b4f5373 -- 2.41.0 From patchwork Wed Apr 3 19:27:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 62683 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 15DC627BBEA; Wed, 3 Apr 2024 20:28:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 3C09A27BBE2 for ; Wed, 3 Apr 2024 20:28:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rs6H9-00022s-Qw; Wed, 03 Apr 2024 15:27:59 -0400 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 1rs6H8-00022V-NB for guix-patches@gnu.org; Wed, 03 Apr 2024 15:27:58 -0400 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 1rs6H7-0000Qe-9F for guix-patches@gnu.org; Wed, 03 Apr 2024 15:27:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rs6HB-00062f-Oy for guix-patches@gnu.org; Wed, 03 Apr 2024 15:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63393] [PATCH V2 2/2] gnu: make-gcc-toolchain: Add gcc:lib. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 19:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: Isaac van Bakel , Simon Tournier , Kaelyn , 63393@debbugs.gnu.org Received: via spool by 63393-submit@debbugs.gnu.org id=B63393.171217244423015 (code B ref 63393); Wed, 03 Apr 2024 19:28:01 +0000 Received: (at 63393) by debbugs.gnu.org; 3 Apr 2024 19:27:24 +0000 Received: from localhost ([127.0.0.1]:59701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs6Ga-0005z9-5K for submit@debbugs.gnu.org; Wed, 03 Apr 2024 15:27:24 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:60775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs6GX-0005yE-MZ for 63393@debbugs.gnu.org; Wed, 03 Apr 2024 15:27:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1712172430; x=1712431630; bh=NCjHnvnoyZ5iuamypCDW/0z0khLjG7pb2sAzTKDK3yY=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=twgjwoCPGupkefq5hrCKYws54mk3dF9zkuIiTtJnFz4SlPFcXfHvWHkafU6zkpBgK TSNtB1I0PyKLUjGElPChoRcF5MHHMhFdy7NVm65yxk5zYyhgsHd6+svXtcOIAs2YN7 tSV6CYImiNsWB5M11O4eZkXrid1X7f60Spw3aPCuk0A1ckzW8kCl5BXzcqaPdfFPlL Jj5dZOlezflA/WSx5OU3h2EBxnkaoi9dXyWNXFPE5I8TvHMn8C6ZzCMJgrM1km8om3 ds681wnlfdL9yqhgvr1bOX58i352S5QDn38ne8fzid08BDdI1aEQ7ETj/aAC1B/7Z/ HpCeNeyFXeLHg== Date: Wed, 03 Apr 2024 19:27:03 +0000 Message-ID: <875xwyw8lc.fsf_-_@protonmail.com> In-Reply-To: <87bk6qw8th.fsf@protonmail.com> References: <87sf9nzoxf.fsf_-_@protonmail.com> <87bk6qw8th.fsf@protonmail.com> Feedback-ID: 7805494:user:proton 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: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias 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 Empty Message From a5a27bdef2e0a6f8f0d6a7a11ad6582ba31f3fc3 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: References: From: John Kehayias Date: Wed, 3 Apr 2024 15:12:06 -0400 Subject: [PATCH 2/2] gnu: make-gcc-toolchain: Add gcc:lib. * gnu/packages/commencement.scm (make-gcc-toolchain)[inputs]: Add gcc:lib. Change-Id: I327a2403d5d14dd545981e8e9dbfd7df24c9357e --- gnu/packages/commencement.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 390bdad250..b4d236c35b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3612,6 +3612,7 @@ (define* (make-gcc-toolchain gcc ("ld-wrapper" ,(car (assoc-ref (%final-inputs (%current-system)) "ld-wrapper"))) ("binutils" ,binutils-final) + ("gcc-lib" ,gcc "lib") ("libc" ,libc) ("libc-debug" ,libc "debug") ("libc-static" ,libc "static")))))) -- 2.41.0