guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: Revert "glibc-mesboot0: debug gash/sh REVERTME"


From: guix-commits
Subject: 03/04: Revert "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 0e5ba1ec195359b92f2f2ff648684560bf5318cb
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Tue Dec 17 09:17:04 2019 +0100

    Revert "glibc-mesboot0: debug gash/sh REVERTME"
    
    This reverts commit 41c0a182d39770ec30a2a1bcc57688005e3ccd24.
---
 gnu/packages/commencement.scm | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index ed69761..d5f059e 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1600,25 +1600,10 @@ 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)))
-
-               (system* "make" (string-append "SHELL=" gash) "sysd-syscalls")
-               (rename-file "sysd-syscalls" "sysd-syscalls-gash"))
+                 (("     [{] [$][(]SHELL[)]") (string-append "   { " gash))))
              #t)))))
     (native-search-paths
      ;; Use the language-specific variables rather than 'CPATH' because they



reply via email to

[Prev in Thread] Current Thread [Next in Thread]