nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: make-bootstrap: Keep Perl as an input only when needed. 

* gnu/packages/make-bootstrap.scm (%static-inputs)[coreutils]: Keep Perl
  as an input only if it's an input of COREUTILS.
This commit is contained in:
Ludovic Courtès 2013-06-14 14:50:33 +02:00
parent 8e59fdd53b
commit af5cb60fec
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/packages/make-bootstrap.scm
View File

@ -83,18 +83,22 @@
(define %static-inputs (define %static-inputs
;; Packages that are to be used as %BOOTSTRAP-INPUTS. ;; Packages that are to be used as %BOOTSTRAP-INPUTS.
(let ((coreutils (package (inherit coreutils) (let ((coreutils (package (inherit coreutils)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("--disable-nls" '("--disable-nls"
"--disable-silent-rules" "--disable-silent-rules"
"--enable-no-install-program=stdbuf,libstdbuf.so" "--enable-no-install-program=stdbuf,libstdbuf.so"
"CFLAGS=-Os -g0" ; smaller, please "CFLAGS=-Os -g0" ; smaller, please
"LDFLAGS=-static -pthread") "LDFLAGS=-static -pthread")
#:tests? #f ; signal-related Gnulib tests fail #:tests? #f ; signal-related Gnulib tests fail
,@(package-arguments coreutils))) ,@(package-arguments coreutils)))
;; Remove optional dependencies such as GMP. ;; Remove optional dependencies such as GMP. Keep Perl
(inputs `(,(assoc "perl" (package-inputs coreutils)))))) ;; except if it's missing (which is the case when
;; cross-compiling).
(inputs (match (assoc "perl" (package-inputs coreutils))
(#f '())
(x (list x))))))
(bzip2 (package (inherit bzip2) (bzip2 (package (inherit bzip2)
(arguments (arguments
(substitute-keyword-arguments (package-arguments bzip2) (substitute-keyword-arguments (package-arguments bzip2)