gnu: make-bootstrap: Build libc and Guile without a .gnu_debuglink.

* gnu/packages/make-bootstrap.scm (glibc-for-bootstrap, %guile-static):
  Add 'outputs' field.
This commit is contained in:
Ludovic Courtès 2013-11-03 22:35:17 +01:00
parent c9323eac74
commit 69f777d14c
1 changed files with 12 additions and 2 deletions

View File

@ -64,7 +64,13 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
;; and can use statically-linked NSS modules. ;; and can use statically-linked NSS modules.
`(cons* "--disable-nscd" "--disable-build-nscd" `(cons* "--disable-nscd" "--disable-build-nscd"
"--enable-static-nss" "--enable-static-nss"
,flags)))))) ,flags))))
;; Remove the 'debug' output to allow bit-reproducible builds (when the
;; 'debug' output is used, ELF files end up with a .gnu_debuglink, which
;; includes a CRC of the corresponding debugging symbols; those symbols
;; contain store file names, so the CRC changes at every rebuild.)
(outputs (delete "debug" (package-outputs base)))))
(define (package-with-relocatable-glibc p) (define (package-with-relocatable-glibc p)
"Return a variant of P that uses the libc as defined by "Return a variant of P that uses the libc as defined by
@ -127,7 +133,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(#f '()) (#f '())
(x (list x)))) (x (list x))))
;; Remove the `debug' output. ;; Remove the 'debug' output (see above for the reason.)
(outputs '("out")))) (outputs '("out"))))
(bzip2 (package (inherit bzip2) (bzip2 (package (inherit bzip2)
(arguments (arguments
@ -472,6 +478,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(name (string-append (package-name guile-2.0) "-static")) (name (string-append (package-name guile-2.0) "-static"))
(source source) (source source)
(synopsis "Statically-linked and relocatable Guile") (synopsis "Statically-linked and relocatable Guile")
;; Remove the 'debug' output (see above for the reason.)
(outputs (delete "debug" (package-outputs guile-2.0)))
(propagated-inputs (propagated-inputs
`(("bdw-gc" ,libgc) `(("bdw-gc" ,libgc)
,@(alist-delete "bdw-gc" ,@(alist-delete "bdw-gc"