From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id EFIYIdHmQmd8vQAA62LTzQ:P1 (envelope-from ) for ; Sun, 24 Nov 2024 08:41:53 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id EFIYIdHmQmd8vQAA62LTzQ (envelope-from ) for ; Sun, 24 Nov 2024 09:41:53 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=WcIBdBp4; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=MBZG11nn; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732437712; a=rsa-sha256; cv=none; b=XGmXQvMFCkdfNWtQ7zsY3gGhD5jhqnw0pZiAofOYFjGdvHOEMOletpy4w5oj2SS7zLlquX 1YfFjZ6F78hoJ41NGTMQsHYDjCIEJfZUjLCZ5DJmqWvLcMUZIlXAxbOf/XpREwJRD/OdrH lWMcctMqO7N68pUzjeynpU/hcOEI9gfFP/nzKtY5dYbhIQA+Eh980s46UEdupL9V5fca2Q 2G+22ZUbNfFja0X+OMKmFY9fQ8fXO0OVn0J42B8XcQZOA1/FrxptHTF0QWY4ijsRGyEghT 9350nD1vazPH52fEdfiGieRSLdRQl1xP3kSMrDf0b0HLR2VPxX1e4AhEhPyvBQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=WcIBdBp4; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=MBZG11nn; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732437712; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=1B8MPLM0v1P1/vnvx5RLM/LODq+I1B3+M3XWeOkGel4=; b=qbkUzdGgW3KFAiNEXxTrx7Z7ahLPvWO9m7ZA/EtrEyfXQX3DQ/fh8sYQiq2MCI1b+s6ERx +JxnBz4/RQipohAmYy0z1e6gmrV7+FK3brrqqvTHMigYNqyjY9RF6C8soOSF2pZbfqFMqX Gvf7q/Y1poATN8apaToupBbtXEA2mVvzVwcAi9WpxyiaRxDDl7tvkN6bGMdf2bFVFHHNTA THeC+iGim4n4lm8WONXbCeS/phCEC9kFd2gqC5GTQ4DZRqCDK7iqUm7MCklq/+KvshLW2O AOUgio0SG2VafSU8QLtd5kR8CHRpGgHcgmgTMjl668iBhsq7s54TcoVWw8Nh6A== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 544498E3C4 for ; Sun, 24 Nov 2024 09:41:52 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Uh-0000Ot-PQ; Sun, 24 Nov 2024 02:57:23 -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 1tF7Uc-0000Ho-LF for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -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 1tF7Ub-0002Lb-MS; Sun, 24 Nov 2024 02:57:18 -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=WcIBdBp4yGkSxTh97oIdyQa++crjGjsJ4GSvN5WVerVBvMgLHL+IL65Y9qVaikZwskU8CnEdHuhs9//0w0jZX0bQExsNnXDBw01/gCSTg6wiWjF7of83gOcNwCNPObQ9g/B9zoHnnFrPdFO6yHMS5OSAMcdhFYJxUv5p1SV/qnDAKneFVYHMZETu2zX7FBtULFy0Zqe3GOnIAXOlYXcuttVlkN1dCDuPGPE5xsb4fIL4Xl8tL2VwnqyXoEHOrqtbwTX7EAlXHCy8E0mYfdf6usm6RtzyVj/6IZRtLnmNHWcmEooWNil1zlumYBoXjBy2QvPmPnJRcf6HWWg/c2Cirw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Ub-0004jX-Fh; Sun, 24 Nov 2024 02:57:17 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 27/58] 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: Sun, 24 Nov 2024 07:57:17 +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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243502517961 (code B ref 74290); Sun, 24 Nov 2024 07:57:17 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:05 +0000 Received: from localhost ([127.0.0.1]:60807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UP-0004fU-3K for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tk-0004Yt-Fr for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:24 -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 1tF7Tf-0002BU-6l; Sun, 24 Nov 2024 02:56:19 -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=MBZG11nn1YLCzs5N+4FT ieGo6Rulk1dYKKIiUdkk5Rnor99wBYjPTr9dHH+6DZz3BIR8W5hPjBA59LF6+uptOeXG66pBTWyu0 exn63zSMYLzIwt1l0h7UUFDzy05e3CMqj84SlbhDdzYaldNcLmkGXEycu4qAqP+TZ5afl3xPIk23g kIP5DZKpHgzoamZkcOo24w2FxgfwzpcoIMbgvyohHq9sKBCJBSVlbeI+yXWB5Hl/hCkteimvWzhl8 wPpNBUtReYzlg/iinqYXFwGO/Nk2kilVI9gpZ9hdEt9cVksPTp4iWWJkR5m/k+Y5m4q94p500jgZI 6KBrD8vQJ1BRtQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:50 +0100 Message-ID: <417cc042f45d6107ca5014cf099e2cb5a3869051.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.98 X-Spam-Score: -6.98 X-Migadu-Queue-Id: 544498E3C4 X-Migadu-Scanner: mx10.migadu.com X-TUID: /b3PTyDFzmv6 * 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 #~'()) -- 2.46.0