janneke pushed a commit to branch wip-bootstrap in repository guix. commit 7f7d774620cfd78607f46f1045d040eb9562c97e Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Thu Jul 12 21:33:14 2018 +0200
gnu: binutils-mesboot: Revise dependencies. * gnu/packages/mes.scm (binutils-mesboot): Revise dependencies. --- gnu/packages/mes.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 4a73ec9..17c8fa3 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -996,7 +996,11 @@ ac_cv_c_float_format='IEEE (little-endian)' (native-inputs `(("binutils-mesboot" ,binutils-mesboot0) ("glibc-mesboot" ,glibc-mesboot) ("gcc-mesboot" ,gcc-mesboot0) - ("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)))) (arguments `(#:parallel-build? #f #:configure-flags '("--enable-deterministic-archives" @@ -1037,16 +1041,9 @@ ac_cv_c_float_format='IEEE (little-endian)' ":" (assoc-ref %build-inputs "gcc-mesboot") "/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 "file") "/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 "bootstrap-coreutils") "/bin" + ":" (assoc-ref %build-inputs "diffutils-boot0") "/bin" + ":" (assoc-ref %build-inputs "make-boot0") "/bin")) (format (current-error-port) "PATH=~a\n" (getenv "PATH")) (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")))))))))))