[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
56/63: gnu: commencement: glibc-mesboot: Use gash only, instead of bash/
From: |
guix-commits |
Subject: |
56/63: gnu: commencement: glibc-mesboot: Use gash only, instead of bash/gash mix. |
Date: |
Thu, 13 Feb 2020 10:11:30 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit d83bd5f92a8b88061a0bed10777eb70a56ed0a8f
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Tue Dec 17 09:12:07 2019 +0100
gnu: commencement: 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 790b2cd..1292ccc 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1497,8 +1497,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
@@ -1556,33 +1561,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))))))))
(define gcc-mesboot0
(package
- 24/63: gnu: commencement: Add grep-mesboot., (continued)
- 24/63: gnu: commencement: Add grep-mesboot., guix-commits, 2020/02/13
- 34/63: gnu: commencement: Add hello-mesboot., guix-commits, 2020/02/13
- 39/63: gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/13
- 40/63: gnu: commencement: gcc-mesboot-wrapper: Use Gash instead of coreutils&co., guix-commits, 2020/02/13
- 44/63: gnu: commencement: Add gawk-boot0., guix-commits, 2020/02/13
- 42/63: gnu: commencement: Remove m4-mesboot., guix-commits, 2020/02/13
- 46/63: gnu: commencement: Add patch-boot0., guix-commits, 2020/02/13
- 30/63: gnu: commencement: Add gcc-core-mesboot1., guix-commits, 2020/02/13
- 47/63: gnu: commencement: Add bzip2-boot0., guix-commits, 2020/02/13
- 54/63: gnu: commencement: gnu-make-mesboot: Rename from make-mesboot., guix-commits, 2020/02/13
- 56/63: gnu: commencement: glibc-mesboot: Use gash only, instead of bash/gash mix.,
guix-commits <=
- 55/63: gnu: commencement: gash-core-utils-boot: Update to 0.0.214-fc1b., guix-commits, 2020/02/13
- 59/63: gnu: Rename 'gash-core-utils' to 'gash-utils'., guix-commits, 2020/02/13
- 48/63: gnu: commencement: Add tar-boot0., guix-commits, 2020/02/13
- 63/63: gnu: commencement: Fix '%boot-mesboot1-inputs'., guix-commits, 2020/02/13
- 61/63: gnu: commencement: Simplify Gash and Gash-Utils., guix-commits, 2020/02/13
- 38/63: gnu: commencement: gcc-mesboot1-wrapper: Use Gash instead of coreutils&co., guix-commits, 2020/02/13
- 49/63: gnu: commencement: Add coreutils-boot0., guix-commits, 2020/02/13
- 51/63: gnu: commencement: %bootstrap-tarballs: Remove %bootstrap-binaries-tarball., guix-commits, 2020/02/13
- 57/63: gnu: commencement: mes-boot: Update to 0.22., guix-commits, 2020/02/13
- 58/63: gnu: commencement: glibc-boot0: Remove gash, use bash-mesboot0 only., guix-commits, 2020/02/13