mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 13:28:12 -05:00
gnu: coreutils: Remove run-time dependency on Bash.
* gnu/packages/base.scm (coreutils)[arguments] <patch-shell-references>: Leave src/split.c unpatched. Set $SHELL. Use .../bin/sh and not .../bin/bash in tests.
This commit is contained in:
parent
84e6756c57
commit
b47b2b5275
1 changed files with 6 additions and 4 deletions
|
@ -263,14 +263,16 @@ (define-public coreutils
|
||||||
'build 'patch-shell-references
|
'build 'patch-shell-references
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(let ((bash (assoc-ref inputs "bash")))
|
(let ((bash (assoc-ref inputs "bash")))
|
||||||
(substitute* (cons "src/split.c"
|
;; 'split' uses either $SHELL or /bin/sh. Set $SHELL so
|
||||||
(find-files "gnulib-tests"
|
;; that tests pass, since /bin/sh isn't in the chroot.
|
||||||
"\\.c$"))
|
(setenv "SHELL" (which "sh"))
|
||||||
|
|
||||||
|
(substitute* (find-files "gnulib-tests" "\\.c$")
|
||||||
(("/bin/sh")
|
(("/bin/sh")
|
||||||
(format #f "~a/bin/sh" bash)))
|
(format #f "~a/bin/sh" bash)))
|
||||||
(substitute* (find-files "tests" "\\.sh$")
|
(substitute* (find-files "tests" "\\.sh$")
|
||||||
(("#!/bin/sh")
|
(("#!/bin/sh")
|
||||||
(format #f "#!~a/bin/bash" bash)))))
|
(format #f "#!~a/bin/sh" bash)))))
|
||||||
%standard-phases)))
|
%standard-phases)))
|
||||||
(synopsis "Core GNU utilities (file, text, shell)")
|
(synopsis "Core GNU utilities (file, text, shell)")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Reference in a new issue