From patchwork Tue Nov 19 06:54:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33603 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 2B7DC27BBE9; Tue, 19 Nov 2024 07:01:46 +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 15B2D27BBE2 for ; Tue, 19 Nov 2024 07:01:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICr-0008SA-Pp; Tue, 19 Nov 2024 01:59:28 -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 1tDICl-0008Q9-Nc for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:19 -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 1tDICl-0004L6-C8; Tue, 19 Nov 2024 01:59:19 -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=1B8MPLM0v1P1/vnvx5RLM/LODq+I1B3+M3XWeOkGel4=; b=g/I17yUDJV0SYgiHMw3OdWvvCRn9qxmMSEn10EnGYgkDK8aA49et3J+3OMFvADhgcpfx5zSGdQtMuJ/YBZBf5VuC9j8QwQ0yzCeuCRi940PO12g3vJJOkSa1T2butJeN5F1jNax7f3rISL/kcYQYEtOxxCXE9ci6v2RCBz/5bDHL6PqvKPQgZ4z4V+PmB6B016UZNqp34gLbg+yK2O/zE6iuFvddt4+P2u1EVp5Q+DrnowOYPmeoiTHGZAipHORBSfdqS0m7Ywocy5l+pqLh/FEs/wbyuwgWM3oiskWELcO8VSLaP5woz+BDWp//dK5gyYPl/1tBzX20TU4K8uwxVQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICl-0005Iu-17; Tue, 19 Nov 2024 01:59:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 25/51] gnu: make-bootstrap: Update gcc-static to gcc-14, for 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:18 +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.173199954420093 (code B ref 74290); Tue, 19 Nov 2024 06:59:18 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:04 +0000 Received: from localhost ([127.0.0.1]:40552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICV-0005Dd-39 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBx-00058O-Kg for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:30 -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 1tDI9m-00040m-M5; Tue, 19 Nov 2024 01:56:14 -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=1B8MPLM0v1P1/vnvx5RLM/LODq+I1B3+M3XWeOkGel4=; b=bmIKD1y5UxBjVWRxCMDj 8p92SzA3QR20CiDj2437rBBrF2QXwy4jI8m6nfBSp1zr3krNMzbTD888xm/4oMWQfn42bVfJ3t+Wv 5oXUdMg8HqNAvlYQIi3rbYT3sc7xbuzJVcvBMvZV7T/SqmN0cBLsTzKdTtlZYliv91DoCq7EGs0Fu IhLZadIFF5faNIG/sH/YXUzHCM59Z5y+o8Z8L5nM/PtX0vMSpnIA3CRQ1tYZL8MxU0nSuDQ6fGSbU euoRP0Oexz3CHyv2Un9sR9Qh9JgheFf+alyFTk0gzbzMOKZS9DteK64DIMugC+jNYCNZIB/y6cPIu nsDEZimWbAG9yg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:55 +0100 Message-ID: <87866dcf5a2a3beef0086aa2a8aa959b11983b0a.1731999203.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/make-bootstrap.scm (%gcc-static): Use gcc-14. Update to use G-Expressions. [inputs]: Remove libstdc++ and libstdc++-headers. (%gcc-stripped): Use gcc-14. [inputs, native-inputs]: Clear fields. Change-Id: I4e6d779cb457b256d80d1882f182b72a6f7d2be2 --- gnu/packages/make-bootstrap.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 689d48d342..e0dcca7b33 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -488,11 +488,11 @@ (define (%glibc-stripped) (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc) + (package (inherit gcc-14) (name "gcc-static") (outputs '("out")) ; all in one (arguments - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments gcc-14) ((#:modules modules %default-gnu-modules) `((srfi srfi-1) (srfi srfi-26) @@ -501,7 +501,7 @@ (define %gcc-static ((#:guile _) #f) ((#:implicit-inputs? _) #t) ((#:configure-flags flags) - `(append (list + #~(append (list ;; We don't need a full bootstrap here. "--disable-bootstrap" @@ -526,9 +526,9 @@ (define %gcc-static "--disable-libssp" "--disable-libquadmath") (remove (cut string-match "--(.*plugin|enable-languages)" <>) - ,flags))) + #$flags))) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-after 'pre-configure 'remove-lgcc_s (lambda _ ;; Remove the '-lgcc_s' added to GNU_USER_TARGET_LIB_SPEC in @@ -538,12 +538,12 @@ (define %gcc-static (substitute* (cons "gcc/config/rs6000/sysv4.h" (find-files "gcc/config" "^gnu-user.*\\.h$")) - ((" -lgcc_s}}") "}}")) - #t)))))) + ((" -lgcc_s}}") "}}")))))))) (inputs `(("zlib:static" ,zlib "static") ("isl:static" ,isl "static") - ,@(package-inputs gcc))) + ,@(fold alist-delete (package-inputs gcc-14) + '("libstdc++" "libstdc++-headers")))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -556,17 +556,19 @@ (define %gcc-static ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) - ,@(package-native-inputs gcc)) - (package-native-inputs gcc)))))) + ,@(package-native-inputs gcc-14)) + (package-native-inputs gcc-14)))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. (package - (inherit gcc) + (inherit gcc-14) (name "gcc-stripped") (build-system trivial-build-system) (source #f) (outputs '("out")) ;only one output + (inputs '()) + (native-inputs '()) (arguments (list #:modules '((guix build utils)) #:builder @@ -632,6 +634,7 @@ (define* (make-guile-static guile patches) (propagated-inputs (modify-inputs (package-propagated-inputs guile) (replace "libgc" libgc/static-libs))) + (arguments (substitute-keyword-arguments (package-arguments guile) ((#:configure-flags flags #~'())