diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-06-21 00:25:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-21 00:25:54 +0200 |
| commit | 56c092ce94cee893898f71ce61e443dd121cccdb (patch) | |
| tree | e0323ffa05b55605112e2ce46500ee13c7707a48 /gnu/packages/bash.scm | |
| parent | d501fad11cfbd69245a4d5e2d632a0ab37985b55 (diff) | |
build-system/gnu: Unify with (guix build-system gnu-cross-build).
* guix/build/gnu-build-system.scm (set-paths): Add `native-inputs' and
`native-search-paths' keyword parameters. Honor them.
(configure): Add `target' and `native-inputs' keyword parameters.
Look for Bash in NATIVE-INPUTS or INPUTS. Pass `--host' when TARGET
is true.
(strip): Add `strip-command' keyword parameter. Use it.
* guix/build/gnu-cross-build.scm: Remove.
* Makefile.am (MODULES): Adjust accordingly.
* gnu/packages/acl.scm, gnu/packages/attr.scm, gnu/packages/base.scm,
gnu/packages/bash.scm, gnu/packages/gawk.scm,
gnu/packages/gettext.scm, gnu/packages/guile.scm,
gnu/packages/libffi.scm, gnu/packages/libsigsegv.scm,
gnu/packages/linux.scm, gnu/packages/ncurses.scm,
gnu/packages/readline.scm, guix/build-system/gnu.scm: Replace
`%standard-cross-phases' by `%standard-phases'. Remove references
to (guix build gnu-cross-build).
Diffstat (limited to 'gnu/packages/bash.scm')
| -rw-r--r-- | gnu/packages/bash.scm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index bf51403f1ae..aa3f397a529 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm | |||
| @@ -82,9 +82,7 @@ | |||
| 82 | 82 | ||
| 83 | #:phases (alist-cons-after 'install 'post-install | 83 | #:phases (alist-cons-after 'install 'post-install |
| 84 | ,post-install-phase | 84 | ,post-install-phase |
| 85 | ,(if (%current-target-system) | 85 | %standard-phases))) |
| 86 | '%standard-cross-phases | ||
| 87 | '%standard-phases)))) | ||
| 88 | (synopsis "The GNU Bourne-Again SHell") | 86 | (synopsis "The GNU Bourne-Again SHell") |
| 89 | (description | 87 | (description |
| 90 | "Bash is the shell, or command language interpreter, that will appear in | 88 | "Bash is the shell, or command language interpreter, that will appear in |
| @@ -106,10 +104,7 @@ modification.") | |||
| 106 | (let ((args `(#:modules ((guix build gnu-build-system) | 104 | (let ((args `(#:modules ((guix build gnu-build-system) |
| 107 | (guix build utils) | 105 | (guix build utils) |
| 108 | (srfi srfi-1) | 106 | (srfi srfi-1) |
| 109 | (srfi srfi-26) | 107 | (srfi srfi-26)) |
| 110 | ,@(if (%current-target-system) | ||
| 111 | '((guix build gnu-cross-build)) | ||
| 112 | '())) | ||
| 113 | ,@(package-arguments bash)))) | 108 | ,@(package-arguments bash)))) |
| 114 | (substitute-keyword-arguments args | 109 | (substitute-keyword-arguments args |
| 115 | ((#:configure-flags flags) | 110 | ((#:configure-flags flags) |
