guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit d901125f4d5547d9622c66f8eb94413fe994bd10 Author: Nicolas Graves <[email protected]> AuthorDate: Sat Feb 21 13:16:00 2026 +0100 gnu: %boot1-inputs: Drop input labels. * gnu/packages/commencement.scm (%boot1-inputs): Drop input labels. (%boot2-inputs): Inject former %boot1-inputs for incremental progress on input label removal. (glibc-final-with-bootstrap-bash, gcc-boot0-intermediate-wrapped) (static-bash-for-libc, glib-final): Adapt accordingly. Change-Id: If91a1c06020976d6e14da9c706fb029b3bf03614 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 70 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dcc2781241d..af668ed05fe 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2993,36 +2993,11 @@ memoized as a function of '%current-system'." (define (%boot1-inputs) ;; 2nd stage inputs. - `(("gcc" ,gcc-boot0) - ("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) - ("gcc" ,gcc-mesboot) - ("libc" ,glibc-mesboot) - ("gzip" ,gzip-mesboot) - ("guile" ,%bootstrap-guile))) - (_ - `(("libc" ,%bootstrap-glibc) - ("gcc" ,%bootstrap-gcc) - ("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* gcc-boot0 + ld-wrapper-boot0 + binutils-boot0 + (fold delete (%boot0-inputs) + (list %bootstrap-binutils binutils-mesboot gcc-mesboot)))) (define/system-dependent glibc-final-with-bootstrap-bash ;; The final libc, "cross-built". If everything went well, the resulting @@ -3080,7 +3055,7 @@ memoized as a function of '%current-system'." (list kernel-headers) ;; The boot inputs, including the bootstrap libc. We don't ;; want it in $CPATH, hence the 'pre-configure' phase above. - (map cadr (%boot1-inputs)) + (%boot1-inputs) ;; A native MiG is needed to build Glibc on Hurd. (if (system-hurd?) (list mig-boot0) @@ -3147,7 +3122,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; non-cross names. (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final-with-bootstrap-bash - (car (assoc-ref (%boot1-inputs) "bash")))) + (%boot0-bash))) (define static-bash-for-glibc ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. @@ -3159,7 +3134,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" glibc-final-with-bootstrap-bash (list glibc-final-with-bootstrap-bash "static") (fold delete - (map cadr (%boot1-inputs)) + (%boot1-inputs) (list gcc-boot0 glibc-mesboot)))) (arguments (append @@ -3245,15 +3220,38 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define/system-dependent gcc-boot0-wrapped ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the ;; non-cross names. - (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final - (car (assoc-ref (%boot1-inputs) "bash")))) + (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final (%boot0-bash))) (define (%boot2-inputs) ;; 3rd stage inputs. `(("libc" ,glibc-final) ("libc:static" ,glibc-final "static") ("gcc" ,gcc-boot0-wrapped) - ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc" "linux-libre-headers")))) + ("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 libstdc++ ;; Intermediate libstdc++ that will allow us to build the final GCC
