~ruther/guix-local

af5cb60fec00a11318dde6210797892b76f791f4 — Ludovic Courtès 12 years ago 8e59fdd
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.
1 files changed, 16 insertions(+), 12 deletions(-)

M gnu/packages/make-bootstrap.scm
M gnu/packages/make-bootstrap.scm => gnu/packages/make-bootstrap.scm +16 -12
@@ 83,18 83,22 @@
(define %static-inputs
  ;; Packages that are to be used as %BOOTSTRAP-INPUTS.
  (let ((coreutils (package (inherit coreutils)
                     (arguments
                      `(#:configure-flags
                        '("--disable-nls"
                          "--disable-silent-rules"
                          "--enable-no-install-program=stdbuf,libstdbuf.so"
                          "CFLAGS=-Os -g0"        ; smaller, please
                          "LDFLAGS=-static -pthread")
                        #:tests? #f   ; signal-related Gnulib tests fail
                        ,@(package-arguments coreutils)))

                     ;; Remove optional dependencies such as GMP.
                     (inputs `(,(assoc "perl" (package-inputs coreutils))))))
                      (arguments
                       `(#:configure-flags
                         '("--disable-nls"
                           "--disable-silent-rules"
                           "--enable-no-install-program=stdbuf,libstdbuf.so"
                           "CFLAGS=-Os -g0"        ; smaller, please
                           "LDFLAGS=-static -pthread")
                         #:tests? #f   ; signal-related Gnulib tests fail
                         ,@(package-arguments coreutils)))

                      ;; Remove optional dependencies such as GMP.  Keep Perl
                      ;; 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)
                 (arguments
                  (substitute-keyword-arguments (package-arguments bzip2)