janneke pushed a commit to branch wip-bootstrap in repository guix. commit 0d0513e2cf461059b4b9c7d2107bddaf58019dc1 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Thu Jul 12 21:07:22 2018 +0200
gnu: glibc-mesboot: Revise dependencies. * gnu/packages/mes.scm (glibc-mesboot): Revise dependencies. --- gnu/packages/mes.scm | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 7cec7a4..af96101 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -818,9 +818,14 @@ ac_cv_c_float_format='IEEE (little-endian)' (base32 "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q")))) (supported-systems '("i686-linux")) + (inputs '()) (native-inputs `(("binutils" ,binutils-mesboot0) ("gcc" ,gcc-core-mesboot) - ("kernel-headers" ,(linux-libre-headers-boot0)))) + + ("bootstrap-coreutils" ,%bootstrap-coreutils&co) + ("diffutils-boot0" ,(@@ (gnu packages commencement) diffutils-boot0)) + ("kernel-headers" ,(linux-libre-headers-boot0)) + ("make-boot0" ,(@@ (gnu packages commencement) gnu-make-boot0)))) (outputs '("out")) (arguments `(#:tests? #f @@ -856,24 +861,16 @@ ac_cv_c_float_format='IEEE (little-endian)' " -D BOOTSTRAP_GLIBC=1")) (cflags (string-append " -L " (getcwd)))) (setenv "CONFIG_SHELL" (string-append - (assoc-ref %build-inputs "bash") + (assoc-ref %build-inputs "bootstrap-coreutils") "/bin/sh")) (setenv "PATH" (string-append - (assoc-ref %build-inputs "binutils") "/bin" + (assoc-ref %build-inputs "bootstrap-coreutils") "/bin" + ":" (assoc-ref %build-inputs "binutils") "/bin" ":" (assoc-ref %build-inputs "gcc") "/bin" - - ;; more bootstrap cheats - ":" (assoc-ref %build-inputs "bash") "/bin" - ":" (assoc-ref %build-inputs "coreutils") "/bin" - ":" (assoc-ref %build-inputs "diffutils") "/bin" - ":" (assoc-ref %build-inputs "gawk") "/bin" - ":" (assoc-ref %build-inputs "grep") "/bin" - ":" (assoc-ref %build-inputs "gzip") "/bin" - ":" (assoc-ref %build-inputs "make") "/bin" - ":" (assoc-ref %build-inputs "sed") "/bin" - ":" (assoc-ref %build-inputs "tar") "/bin")) + ":" (assoc-ref %build-inputs "diffutils-boot0") "/bin" + ":" (assoc-ref %build-inputs "make-boot0") "/bin")) (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))