47/63: bootstrap: glibc-mesboot: Scheme-only bootstrap.

[guix-commits]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit c00d324d94ba1187a4d2c0d82a2fc87a4ba4bc5e
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Nov 22 22:16:22 2019 +0100

    bootstrap: glibc-mesboot: Scheme-only bootstrap.
    
    * gnu/packages/commencement.scm (glibc-mesboot): Scheme-only bootstrap.
---
 gnu/packages/commencement.scm | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 12bc679..99d7598 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2437,19 +2437,27 @@ SHELL := " shell "
   (package
     (inherit glibc-headers-mesboot)
     (name "glibc-mesboot")
-    (native-inputs `(("binutils" ,binutils-mesboot)
-                     ("libc" ,glibc-mesboot0)
-                     ("headers" ,glibc-headers-mesboot)
-                     ("gcc" ,gcc-mesboot1)
-
-                     ("bash" ,%bootstrap-coreutils&co)
-                     ("coreutils" ,%bootstrap-coreutils&co)
+    (native-inputs `(("bash" ,bash-mesboot)
+                     ("binutils" ,binutils-mesboot)
+                     ("coreutils" ,coreutils-mesboot0)
                      ("diffutils" ,diffutils-mesboot)
-                     ("kernel-headers" ,%bootstrap-linux-libre-headers)
-                     ("make" ,make-mesboot)))
+                     ("gawk" ,gawk-mesboot)
+                     ("gcc" ,gcc-mesboot1)
+                     ("grep" ,grep-mesboot)
+                     ("gzip" ,gzip-mesboot0)
+                     ("headers" ,glibc-headers-mesboot)
+                     ("libc" ,glibc-mesboot0)
+                     ("make" ,make-mesboot)
+                     ("patch" ,patch-mesboot0)
+                     ("sed" ,sed-mesboot)
+                     ("tar" ,tar-mesboot)
+                     ("xz" ,xz-mesboot)
 
+                     ;; ("gash" ,%bootstrap-gash+coreutils)
+                     ;; ("guile" ,%bootstrap-guile)
+                     ("kernel-headers" ,%bootstrap-linux-libre-headers)))
     (arguments
-     `(#:validate-runpath? #f               ; fails when using --enable-shared
+     `(#:validate-runpath? #f ; fails when using --enable-shared
        ,@(substitute-keyword-arguments (package-arguments 
glibc-headers-mesboot)
            ((#:make-flags make-flags)
             `(let ((bash (assoc-ref %build-inputs "bash")))
@@ -2461,9 +2469,9 @@ SHELL := " shell "
                    (let* ((kernel-headers (assoc-ref %build-inputs 
"kernel-headers"))
                           (out (assoc-ref outputs "out"))
                           (install-flags (cons "install" make-flags)))
-                     (apply invoke "make" install-flags)
-                     (copy-recursively kernel-headers out)
-                     #t))))))))
+                     (and (apply invoke "make" install-flags)
+                          (copy-recursively kernel-headers out)
+                          #t)))))))))
     (native-search-paths ;; FIXME: move to glibc-mesboot0
      ;; Use the language-specific variables rather than 'CPATH' because they
      ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'.