diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-10 18:27:42 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-10 18:27:42 +0100 |
| commit | 7f31c71cb8f37e0baadb72e3f205ce55037adfba (patch) | |
| tree | a42e0e8c62e016ddba943327777792c27241be3a /gnu/packages/base.scm | |
| parent | cc0a12822659d2eadaf0401d1660f558da004b4b (diff) | |
| download | gnu-guix-7f31c71cb8f37e0baadb72e3f205ce55037adfba.tar gnu-guix-7f31c71cb8f37e0baadb72e3f205ce55037adfba.tar.gz | |
gnu: coreutils: Fix cross-compilation issue with 'dummy-man'.
This should work around the bug described at
<http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch>.
* gnu/packages/base.scm (coreutils)[patches]: Add
'coreutils-dummy-man.patch'.
[native-inputs]: Don't pass PERL when (%current-target-system) is
true.
* gnu/packages/patches/coreutils-dummy-man.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 385acdef98..d6f75be238 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -239,14 +239,19 @@ used to apply commands with arbitrarily long arguments.") version ".tar.xz")) (sha256 (base32 - "04hjzzv434fb8ak3hh3dyhdvg3hqjjwvjmjxqzk1gh2jh6cr8gjv")))) + "04hjzzv434fb8ak3hh3dyhdvg3hqjjwvjmjxqzk1gh2jh6cr8gjv")) + (patches (list (search-patch "coreutils-dummy-man.patch"))))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp))) (native-inputs ;; Perl is needed to run tests in native builds, and to run the bundled - ;; copy of help2man. - `(("perl" ,perl))) + ;; copy of help2man. However, don't pass it when cross-compiling since + ;; that would lead it to try to run programs to get their '--help' output + ;; for help2man. + (if (%current-target-system) + '() + `(("perl" ,perl)))) (outputs '("out" "debug")) (arguments `(#:parallel-build? #f ; help2man may be called too early |