guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 96f86634e039de7185c1550f9a3b2d0101087f78 Author: Nicolas Graves <[email protected]> AuthorDate: Sun Feb 22 00:05:13 2026 +0100 gnu: %boot2-inputs: Drop input labels. * gnu/packages/commencement.scm (%boot2-inputs): Drop input labels. (%boot3-inputs): Inject former %boot2-inputs for incremental progress on input label removal. (binutils-final, ld-wrapper-boot3): Adapt accordingly. (libstdc++, gcc-final): Make labels that can't currently be dropped explicit. Change-Id: Iac30d41267224a34e4f1b135d99b38ca8320c467 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 90 +++++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 34 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d23d3153b87..98524ce99f0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3225,34 +3225,15 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define (%boot2-inputs) ;; 3rd stage inputs. - `(("libc" ,glibc-final) - ("libc:static" ,glibc-final "static") - ("gcc" ,gcc-boot0-wrapped) - ("ld-wrapper-cross" ,ld-wrapper-boot0) - ("binutils-cross" ,binutils-boot0) - ,@(match (%current-system) - ((or "i686-linux" "x86_64-linux") - `(("bzip2" ,bzip2-boot0) - ("coreutils" ,coreutils-boot0) - ("gawk" ,gawk-boot0) - ("patch" ,patch-boot0) - ("sed" ,sed-boot0) - ("tar" ,tar-boot0) - ("bash" ,bash-mesboot) - ("grep" ,grep-mesboot) - ("tar" ,tar-mesboot) - ("xz" ,xz-mesboot) - ("gcc-wrapper" ,gcc-mesboot-wrapper) - ("gzip" ,gzip-mesboot) - ("guile" ,%bootstrap-guile))) - (_ - `(("coreutils&co" ,%bootstrap-coreutils&co) - ;; In gnu-build-system.scm, we rely on the availability of Bash. - ("bash" ,%bootstrap-coreutils&co)))) - ("make" ,gnu-make-boot0) - ("diffutils" ,diffutils-boot0) - ("findutils" ,findutils-boot0) - ("file" ,file-boot0))) + (cons* glibc-final + (list glibc-final "static") + gcc-boot0-wrapped + (fold delete + (%boot1-inputs) + (list %bootstrap-gcc + %bootstrap-glibc + gcc-boot0 + glibc-mesboot)))) (define libstdc++ ;; Intermediate libstdc++ that will allow us to build the final GCC @@ -3279,7 +3260,18 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (string-append "--with-gxx-include-dir=" #$output "/include")))))) (outputs '("out")) - (inputs (%boot2-inputs)) + (inputs `(("libc" ,glibc-final) + ("libc:static" ,glibc-final "static") + ("gcc" ,gcc-boot0-wrapped) + ("ld-wrapper-cross" ,ld-wrapper-boot0) + ("binutils-cross" ,binutils-boot0) + ,@(map packages->input-alist + (fold delete (%boot2-inputs) + (list glibc-final + (list glibc-final "static") + gcc-boot0-wrapped + ld-wrapper-boot0 + binutils-boot0))))) (synopsis "GNU C++ standard library (intermediate)")))) (define binutils-final @@ -3308,8 +3300,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inputs (match (%current-system) ((? target-powerpc?) - `(("bash" ,static-bash-for-glibc) - ,@(%boot2-inputs))) + (cons* static-bash-for-glibc (%boot2-inputs))) (_ (%boot2-inputs)))))) (define zlib-final @@ -3329,7 +3320,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (make-ld-wrapper "ld-wrapper-boot3" #:binutils binutils-final #:guile %bootstrap-guile - #:bash (car (assoc-ref (%boot2-inputs) "bash")) + #:bash (%boot0-bash) #:guile-for-build %bootstrap-guile)) (define gcc-final @@ -3423,7 +3414,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" perl-boot0 ;for manpages static-bash-for-glibc))) (inputs - (modify-inputs (%boot2-inputs) + (modify-inputs + `(("libc" ,glibc-final) + ("libc:static" ,glibc-final "static") + ,@(map packages->input-alist + (fold delete (%boot2-inputs) + (list glibc-final (list glibc-final "static"))))) (prepend (bootstrap-origin (package-source gmp-6.0)) (package-source mpfr) (package-source mpc) @@ -3436,7 +3432,33 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; 4th stage inputs. `(("gcc" ,gcc-final) ("ld-wrapper" ,ld-wrapper-boot3) - ,@(alist-delete "gcc" (%boot2-inputs)))) + ("libc" ,glibc-final) + ("libc:static" ,glibc-final "static") + ("ld-wrapper-cross" ,ld-wrapper-boot0) + ("binutils-cross" ,binutils-boot0) + ,@(match (%current-system) + ((or "i686-linux" "x86_64-linux") + `(("bzip2" ,bzip2-boot0) + ("coreutils" ,coreutils-boot0) + ("gawk" ,gawk-boot0) + ("patch" ,patch-boot0) + ("sed" ,sed-boot0) + ("tar" ,tar-boot0) + ("bash" ,bash-mesboot) + ("grep" ,grep-mesboot) + ("tar" ,tar-mesboot) + ("xz" ,xz-mesboot) + ("gcc-wrapper" ,gcc-mesboot-wrapper) + ("gzip" ,gzip-mesboot) + ("guile" ,%bootstrap-guile))) + (_ + `(("coreutils&co" ,%bootstrap-coreutils&co) + ;; In gnu-build-system.scm, we rely on the availability of Bash. + ("bash" ,%bootstrap-coreutils&co)))) + ("make" ,gnu-make-boot0) + ("diffutils" ,diffutils-boot0) + ("findutils" ,findutils-boot0) + ("file" ,file-boot0))) (define bash-final ;; Link with `-static-libgcc' to make sure we don't retain a reference
