From patchwork Tue May 9 17:04:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 49900 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 836F727BBED; Tue, 9 May 2023 18:05:24 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 E6A4927BBEB for ; Tue, 9 May 2023 18:05:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwQlt-0005Fv-8Q; Tue, 09 May 2023 13:05:05 -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 1pwQlq-0005F6-OR for guix-patches@gnu.org; Tue, 09 May 2023 13:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwQlq-0005i7-FT for guix-patches@gnu.org; Tue, 09 May 2023 13:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwQlq-0007ox-9F for guix-patches@gnu.org; Tue, 09 May 2023 13:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63393] [PATCH 1/2] gnu: gcc-toolchain: Do not use gcc-final. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 May 2023 17:05:02 +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: 63393@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 63393-submit@debbugs.gnu.org id=B63393.168365186129982 (code B ref 63393); Tue, 09 May 2023 17:05:02 +0000 Received: (at 63393) by debbugs.gnu.org; 9 May 2023 17:04:21 +0000 Received: from localhost ([127.0.0.1]:44337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwQlA-0007nV-Om for submit@debbugs.gnu.org; Tue, 09 May 2023 13:04:21 -0400 Received: from mail-wm1-f47.google.com ([209.85.128.47]:38360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwQl8-0007nE-AM for 63393@debbugs.gnu.org; Tue, 09 May 2023 13:04:19 -0400 Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-3f42379d553so4845705e9.1 for <63393@debbugs.gnu.org>; Tue, 09 May 2023 10:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683651852; x=1686243852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RdcYQ7HMlcTvWAUBctmYxUVnCnEAkvatZCKLvxNc9Q4=; b=jTxTobNj/neWMZGj6g9ch5si3YBr3GyvwPaRdSA4P6RZqfNjj/MkMrQ7fp2r87SYNH aRTcW8btAk9XUIJfcnIDulvQUWfQjPiePsI36xPJhBB6xqpO7f4a5oYK6K6Sf+7BjSys XC6TxikOv3/1a/hkhnNhbOdSsWRZE6dfrBaDiiC7AC+tVpwa/P8xKtJUOdtzEIgzgjEQ 43Ia9hhj8UoHEHQy2mqIkhPgYxg2ur8/LoODj2wYrUg1ZKWDAvvqEKPMehr7jvloHdR3 fd6uhgsWb5iI9jaa8sW4GhnD1EY2QOqI3po6NmsD8NemhsDFQS1j6X6uCWC23Uud+OUR Y2nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683651852; x=1686243852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RdcYQ7HMlcTvWAUBctmYxUVnCnEAkvatZCKLvxNc9Q4=; b=Jb3ZXDlD7Ee1cPA7hk5MsSAvmHGM6bwI5ErEWg2/wyKrFMmwVorjuwlLNVcDxQI0h8 jIO1cQLR4RfCyWdcXJA98hWew45M1rleAwrvo3jb3wk3GsSi3BQkumrOv2G24T87cBYx OlRYh1U2/3knB3RSJLgxNaKWKCx1YiKeOVN518Vp4tI7aLwUdZLhkENLxsOo0SVY/1d8 FA0xbAXA6eUGTaopeblCp7vOY9uxDl3gepPwHFcKXqjiHsidgZ19K4oKbLWW9Crt+O8L aQ29yvJLs6IywXL7yS18rYg0vqkj8BBcctiYu0OX54WF3JVE170uUeJc/DnM4z0VNJq2 H5wA== X-Gm-Message-State: AC+VfDxlFmkhu2BZVcup0aUVuWmuXrhppKnTxoLI6lX13fFMR6Da48sy CMIhYkLF3TTgyfN2SC5B/umJJgz+pqk= X-Google-Smtp-Source: ACHHUZ5065KnnisrEWud7qnpcKedCzI8iXW4HekVgtH2r0K5SUVe8lxbtCYgnsa3NRJiGqrLNHHQCA== X-Received: by 2002:a05:600c:3581:b0:3f4:27ff:2ed7 with SMTP id p1-20020a05600c358100b003f427ff2ed7mr4314193wmq.4.1683651852318; Tue, 09 May 2023 10:04:12 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id c20-20020a7bc014000000b003ef64affec7sm20371185wmb.22.2023.05.09.10.04.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:04:11 -0700 (PDT) From: Simon Tournier Date: Tue, 9 May 2023 19:04:04 +0200 Message-Id: <27f75012219400a41da9c3148ec42fd4cec38cc4.1683650835.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 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 (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 ab07fb37ab..7ec177e206 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3486,8 +3486,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)) @@ -3514,15 +3512,19 @@ (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)) +;; 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 From patchwork Tue May 9 17:04:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 49901 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 2393F27BBEC; Tue, 9 May 2023 18:06:15 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 1541327BBEB for ; Tue, 9 May 2023 18:06:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwQmp-0006Ha-9m; Tue, 09 May 2023 13:06: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 1pwQmo-0006FY-8W for guix-patches@gnu.org; Tue, 09 May 2023 13:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwQmn-000696-Vu for guix-patches@gnu.org; Tue, 09 May 2023 13:06:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwQmn-0007qq-R7 for guix-patches@gnu.org; Tue, 09 May 2023 13:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63393] [PATCH 2/2] gnu: make-gcc-toolchain: Add 'lib' outputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 May 2023 17:06: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: 63393@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 63393-submit@debbugs.gnu.org id=B63393.168365193330142 (code B ref 63393); Tue, 09 May 2023 17:06:01 +0000 Received: (at 63393) by debbugs.gnu.org; 9 May 2023 17:05:33 +0000 Received: from localhost ([127.0.0.1]:44346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwQmL-0007q6-Gq for submit@debbugs.gnu.org; Tue, 09 May 2023 13:05:33 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:39147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwQmI-0007pn-C7 for 63393@debbugs.gnu.org; Tue, 09 May 2023 13:05:31 -0400 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3f42b429290so2342865e9.0 for <63393@debbugs.gnu.org>; Tue, 09 May 2023 10:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683651924; x=1686243924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bh/1yXXha0TWzsIQcfdAysgvyo8dgUasYfGjAhG2FLU=; b=EqG8I4ErW5joBIAGRBvrLQmL0lZFW0o1GpNDdGR61rvjGvOA4ewB55pxCI4YXig40H yQzcXdJZ7jY76TMhb0I2qV/gEK2j5ughHDbczpGf31HGijrN8DbANtOY8BJDFCIhrkVg bWj826s/RwKUmFZghaBMdBuKUqb/2DJHcgJB6IQzkfvE2TjlbU+X3ZKGsjDufiC2yAI3 Hl4L0aM0HdFY0eDRYAxwoI0I7C4LXk+dUJQV5edWsw5qpMlqbvvJA2QlzXqfvUSyUvH9 c3w/gdm1hSjOI5CtwtmKeVkSyBh5ZK7ZEFlgXp9xRjl6KzQ6E+5oP6YsTu7PDntuwG0F 7kUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683651924; x=1686243924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bh/1yXXha0TWzsIQcfdAysgvyo8dgUasYfGjAhG2FLU=; b=IVTdifc8iKOHBjLO5Q2eJymbv8oZHp6Uo3l17xoQ4/JCkLEggePi0Kj6LQJkDoPECh hKbLP7XvyLzlj2Mawqh0x//HIuvrycgXV051rTyYLQMR/PQG6xKRVGZhyVyjIjhwBL6M 1hbMHOxX8lacup5MmeBKIi+FgK/VTmyQ28eWnolPrh7HxoTjyJqhLktBKoIaYh9WcLrM IGGcgc+U/8C+GlM/4ZQ/XieuOZpkRqdJA+fS52pVh++RmLkPpY5w0nKckLxdzlp5arIc Gc2jWB6kniWWZhFxW5tlOOKSMqcpkhjDz/DB93mNNQNhBY4nzFvFeRwoJWyo79gpfVa7 9Dag== X-Gm-Message-State: AC+VfDyQUSVl4NYun3Ji6JB3iAYq6s1T3IIxIXgCuNbOTv5eHutoTxPv 01dR9wdxjZtmWkc4kNBvvN+T70CmZDQ= X-Google-Smtp-Source: ACHHUZ7k7Aa2+Lgt2yfzLxs6JRvk6aFQXtU6+0kPKExwseDUsJXfjPshdJHnUuTqXcEKlzbVZnq/8g== X-Received: by 2002:a05:600c:1c0e:b0:3f4:26ce:e7be with SMTP id j14-20020a05600c1c0e00b003f426cee7bemr4808416wms.3.1683651924370; Tue, 09 May 2023 10:05:24 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id c20-20020a7bc014000000b003ef64affec7sm20371185wmb.22.2023.05.09.10.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:05:24 -0700 (PDT) From: Simon Tournier Date: Tue, 9 May 2023 19:04:05 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 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 (make-gcc-toolchain): Add 'lib' outputs. --- gnu/packages/commencement.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7ec177e206..94d5884a9c 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2022 Ricardo Wurmus ;;; Copyright © 2022 Ekaitz Zarraga +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -3444,15 +3445,30 @@ (define* (make-gcc-toolchain gcc (filter-map (match-lambda (("libc-debug" . _) #f) (("libc-static" . _) #f) + (("gcc-lib" . _) #f) + (("gcc-debug" . _) #f) ((_ . directory) directory)) %build-inputs)) (union-build (assoc-ref %outputs "debug") (list (assoc-ref %build-inputs - "libc-debug"))) + "libc-debug") + (assoc-ref %build-inputs + "gcc-debug"))) + (union-build (assoc-ref %outputs "static") (list (assoc-ref %build-inputs "libc-static"))) + + (union-build (assoc-ref %outputs "lib") + (list (assoc-ref %build-inputs + "ld-wrapper") + (assoc-ref %build-inputs + "binutils") + (assoc-ref %build-inputs + "gcc-lib") + (assoc-ref %build-inputs + "libc"))) #t)))) (native-search-paths @@ -3474,7 +3490,7 @@ (define* (make-gcc-toolchain gcc binaries, plus debugging symbols in the @code{debug} output), and Binutils. GCC is the GNU Compiler Collection.") (home-page "https://gcc.gnu.org/") - (outputs '("out" "debug" "static")) + (outputs '("out" "debug" "static" "lib")) ;; The main raison d'être of this "meta-package" is (1) to conveniently ;; install everything that we need, and (2) to make sure ld-wrapper comes @@ -3484,8 +3500,9 @@ (define* (make-gcc-toolchain gcc ("binutils" ,binutils-final) ("libc" ,libc) ("libc-debug" ,libc "debug") - ("libc-static" ,libc "static")))))) - + ("libc-static" ,libc "static") + ("gcc-lib" ,gcc "lib") + ("gcc-debug" ,gcc "debug")))))) (define-public gcc-toolchain-4.8 (make-gcc-toolchain gcc-4.8))