[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: glibc-mesboot0: debug gash/sh REVERTME
From: |
guix-commits |
Subject: |
02/04: glibc-mesboot0: debug gash/sh REVERTME |
Date: |
Tue, 17 Dec 2019 12:42:18 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 41c0a182d39770ec30a2a1bcc57688005e3ccd24
Author: Jan Nieuwenhuizen <address@hidden>
Date: Mon Dec 16 22:05:05 2019 +0100
glibc-mesboot0: debug gash/sh REVERTME
---
gnu/packages/commencement.scm | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d5f059e..ed69761 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1600,10 +1600,25 @@ BASH = ")))
;; ../sysdeps/generic/uname.c:25: config-name.h: error 02
(substitute* "sysdeps/unix/make-syscalls.sh"
+ (("#!/gnu/store.*/bin/bash") (string-append "#! " shell)))
+
+ (copy-file "sysdeps/unix/Makefile" "sysdeps/unix/Makefile.orig")
+ (substitute* "sysdeps/unix/Makefile"
+ ((" [{] [$][(]SHELL[)]") (string-append " { " shell)))
+
+ (system* "make" (string-append "SHELL=" shell) "sysd-syscalls")
+ (rename-file "sysd-syscalls" "sysd-syscalls-bash")
+
+ ;; ../sysdeps/generic/uname.c:25: config-name.h: error 02
+ (substitute* "sysdeps/unix/make-syscalls.sh"
(("#!/gnu/store.*/bin/bash") (string-append "#! " gash)))
+ (copy-file "sysdeps/unix/Makefile.orig" "sysdeps/unix/Makefile")
(substitute* "sysdeps/unix/Makefile"
- ((" [{] [$][(]SHELL[)]") (string-append " { " gash))))
+ ((" [{] [$][(]SHELL[)]") (string-append " { " gash)))
+
+ (system* "make" (string-append "SHELL=" gash) "sysd-syscalls")
+ (rename-file "sysd-syscalls" "sysd-syscalls-gash"))
#t)))))
(native-search-paths
;; Use the language-specific variables rather than 'CPATH' because they