04/06: gnu: glibc: _PATH_BSHELL refers to our static bash.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit d56f8d5e749496362d76bbbf364c8eba2260c6e5
Author: Ludovic Courtès <address@hidden>
Date:   Sun Aug 30 14:20:08 2015 +0200

    gnu: glibc: _PATH_BSHELL refers to our static bash.
    
    * gnu/packages/base.scm (glibc)[arguments]: Change _PATH_BSHELL in
      paths.h to refer to STATIC-BASH.
---
 gnu/packages/base.scm |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 36c9c63..5eb44ee 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -553,6 +553,13 @@ store.")
                         (("/bin/sh")
                          (string-append bash "/bin/bash")))
 
+                      ;; Same for the shell used by the 'exec' functions for
+                      ;; scripts that lack a shebang.
+                      (substitute* (find-files "." "^paths\\.h$")
+                        (("#define[[:blank:]]+_PATH_BSHELL[[:blank:]].*$")
+                         (string-append "#define _PATH_BSHELL \""
+                                        bash "/bin/bash\"\n")))
+
                       ;; Make sure we don't retain a reference to the
                       ;; bootstrap Perl.
                       (substitute* "malloc/mtrace.pl"