diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-20 18:02:07 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-20 18:02:07 +0100 |
| commit | 530c169561b366d60457e499f7eb198929ffa917 (patch) | |
| tree | 8eddadfa1708a7a49c6265d6d8253d86f2609a08 /distro/packages/bash.scm | |
| parent | c20313637f1676a50c009db6da60d97a93467f2f (diff) | |
| download | guix-patches-530c169561b366d60457e499f7eb198929ffa917.tar guix-patches-530c169561b366d60457e499f7eb198929ffa917.tar.gz | |
distro: bash, readline: Patch so that `make' uses the right shell.
* distro/packages/readline.scm (readline): Add `pre-configure-phase' to
patch `MAKE_SHELL' in `configure. Move `post-install-phase' body to
a variable.
* distro/packages/bash.scm (bash): Likewise.
Diffstat (limited to 'distro/packages/bash.scm')
| -rw-r--r-- | distro/packages/bash.scm | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/distro/packages/bash.scm b/distro/packages/bash.scm index 944bd077a3..c2022fcf95 100644 --- a/distro/packages/bash.scm +++ b/distro/packages/bash.scm @@ -32,7 +32,20 @@ "-DSTANDARD_UTILS_PATH='\"/no-such-path\"'" "-DNON_INTERACTIVE_LOGIN_SHELLS" "-DSSH_SOURCE_BASHRC") - " "))) + " ")) + (pre-configure-phase + '(lambda* (#:key inputs #:allow-other-keys) + ;; Use the right shell for makefiles. + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "configure" + (("MAKE_SHELL=[^ ]+") + (format #f "MAKE_SHELL=~a/bin/bash" bash)))))) + (post-install-phase + '(lambda* (#:key outputs #:allow-other-keys) + ;; Add a `bash' -> `sh' link. + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion (string-append out "/bin") + (symlink "bash" "sh")))))) (package (name "bash") (version "4.2") @@ -67,15 +80,12 @@ ;; for now. #:tests? #f - #:phases - (alist-cons-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - ;; Add a `bash' -> `sh' link. - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion - (string-append out "/bin") - (symlink "bash" "sh")))) - %standard-phases))) + #:phases (alist-cons-before + 'configure 'pre-configure + ,pre-configure-phase + (alist-cons-after 'install 'post-install + ,post-install-phase + %standard-phases)))) (synopsis "GNU Bourne-Again Shell") (description "Bash is the shell, or command language interpreter, that will appear in |