diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-05-25 16:24:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-05-25 16:24:21 +0200 |
| commit | de59af4d6d1f6143c063878b451f9fe163eed982 (patch) | |
| tree | 69ae44c0766fa523046629a4510a30914ee10834 /gnu | |
| parent | 2a552f1177fc79a66ba5ae53467556dfa3386b68 (diff) | |
gnu: coreutils: Allow cross-compilation.
* gnu/packages/base.scm (coreutils): Remove Perl input
when (%current-target-system) is true. Use %standard-cross-phases as
the base when (%current-target-system) is true.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 2ed9de0d5d6..b1bc5ca2d1b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm | |||
| @@ -270,9 +270,13 @@ The tools supplied with this package are: | |||
| 270 | (base32 | 270 | (base32 |
| 271 | "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd")))) | 271 | "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd")))) |
| 272 | (build-system gnu-build-system) | 272 | (build-system gnu-build-system) |
| 273 | (inputs `(("acl" ,acl) | 273 | (inputs `(("acl" ,acl) ; TODO: add SELinux |
| 274 | ("gmp" ,gmp) | 274 | ("gmp" ,gmp) |
| 275 | ("perl" ,perl))) ; TODO: add SELinux | 275 | |
| 276 | ;; Perl is needed to run tests; remove it from cross builds. | ||
| 277 | ,@(if (%current-target-system) | ||
| 278 | '() | ||
| 279 | `(("perl" ,perl))))) | ||
| 276 | (arguments | 280 | (arguments |
| 277 | `(#:parallel-build? #f ; help2man may be called too early | 281 | `(#:parallel-build? #f ; help2man may be called too early |
| 278 | #:phases (alist-cons-before | 282 | #:phases (alist-cons-before |
| @@ -287,7 +291,9 @@ The tools supplied with this package are: | |||
| 287 | (substitute* (find-files "tests" "\\.sh$") | 291 | (substitute* (find-files "tests" "\\.sh$") |
| 288 | (("#!/bin/sh") | 292 | (("#!/bin/sh") |
| 289 | (format #f "#!~a/bin/bash" bash))))) | 293 | (format #f "#!~a/bin/bash" bash))))) |
| 290 | %standard-phases))) | 294 | ,(if (%current-target-system) |
| 295 | '%standard-cross-phases | ||
| 296 | '%standard-phases)))) | ||
| 291 | (synopsis "Core GNU utilities (file, text, shell)") | 297 | (synopsis "Core GNU utilities (file, text, shell)") |
| 292 | (description | 298 | (description |
| 293 | "The GNU Core Utilities are the basic file, shell and text manipulation | 299 | "The GNU Core Utilities are the basic file, shell and text manipulation |
