04/04: bootstrap: glibc-mesboot: Use gash only, instead of bash/gash mix.

[guix-commits]

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

commit 6b13af5b2f8becc76df6847df82a46eef19ee39c
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Tue Dec 17 09:12:07 2019 +0100

    bootstrap: glibc-mesboot: Use gash only, instead of bash/gash mix.
    
    While this works and is much cleaner, it is also much slower.
    
    * gnu/packages/commencement.scm (glibc-mesboot0): Use gash only, instead of
    bash/gash mix.
---
 gnu/packages/commencement.scm | 49 ++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d5f059e..633c9fd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1519,8 +1519,13 @@ ac_cv_c_float_format='IEEE (little-endian)'
     (native-inputs `(("boot-patch" ,(search-patch "glibc-boot-2.2.5.patch"))
                      ("system-patch" ,(search-patch 
"glibc-bootstrap-system-2.2.5.patch"))
                      ("headers" ,mesboot-headers)
-                     ,@(%boot-mesboot-core-inputs)
-                     ("gash" ,gash-boot)))
+                     ;; XXX: make-syscalls.sh does not run correctly with
+                     ;; bash-mesboot0, producing a wrong sysd-syscalls.
+                     ;; This leads to posix/uname.c getting compiled where it
+                     ;; shouldn't:
+                     ;; ../sysdeps/generic/uname.c:25: config-name.h: error 02
+                     ("bash" ,gash-boot)
+                     ,@(%boot-mesboot-core-inputs)))
     (outputs '("out"))
     (arguments
      `(#:implicit-inputs? #f
@@ -1578,33 +1583,19 @@ ac_cv_c_float_format='IEEE (little-endian)'
              (format (current-error-port)
                      "running ./configure ~a\n" (string-join configure-flags))
              (apply invoke "./configure" configure-flags)))
-         (add-after 'configure 'fixup-configure
-           (lambda _
-             (let* ((out (assoc-ref %outputs "out"))
-                    (bash (assoc-ref %build-inputs "bash"))
-                    (shell (string-append bash "/bin/bash"))
-                    (gash (assoc-ref %build-inputs "gash"))
-                    (gash (string-append gash "/bin/gash")))
-               (substitute* "config.make"
-                 (("INSTALL = scripts/") "INSTALL = $(..)./scripts/"))
-               (substitute* "config.make"
-                 (("INSTALL = scripts/") "INSTALL = $(..)./scripts/")
-                 (("BASH = ") (string-append
-                               "SHELL = " shell "
-BASH = ")))
-               ;; XXX: make-syscalls.sh does not run correctly with
-               ;; bash-mesboot0, producing a wrong sysd-syscalls.
-
-               ;; This leads to posix/uname.c getting compiled where it
-               ;; shouldn't:
-
-               ;; ../sysdeps/generic/uname.c:25: config-name.h: error 02
-               (substitute* "sysdeps/unix/make-syscalls.sh"
-                 (("#!/gnu/store.*/bin/bash") (string-append "#! " gash)))
-
-               (substitute* "sysdeps/unix/Makefile"
-                 (("     [{] [$][(]SHELL[)]") (string-append "   { " gash))))
-             #t)))))
+                  (add-after 'configure 'fixup-configure
+                    (lambda _
+                      (let* ((out (assoc-ref %outputs "out"))
+                             (bash (assoc-ref %build-inputs "bash"))
+                             (shell (string-append bash "/bin/bash")))
+                        (substitute* "config.make"
+                          (("INSTALL = scripts/") "INSTALL = $(..)./scripts/"))
+                        (substitute* "config.make"
+                          (("INSTALL = scripts/") "INSTALL = $(..)./scripts/")
+                          (("BASH = ") (string-append
+                                        "SHELL = " shell "
+         BASH = ")))
+                        #t))))))
     (native-search-paths
      ;; Use the language-specific variables rather than 'CPATH' because they
      ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'.