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

gnu: commencement: Avoid redundant Perl rebuild. 

This removes a redundant (yet different) "perl-boot0" node from the
early derivation graph.

* gnu/packages/commencement.scm (bison-boot1): Move 'native-inputs'
field to the final package.  Previously PERL-BOOT0 got rebuilt with
%BOOT0-INPUTS, leading to a different derivation.
(static-bash-for-glibc): Likewise.
This commit is contained in:
Ludovic Courtès 2015-12-18 23:50:15 +01:00
parent 09964b4fc6
commit 32243bfb57
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/packages/commencement.scm
View File

@ -429,14 +429,15 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(current-source-location) (current-source-location)
#:guile %bootstrap-guile))) #:guile %bootstrap-guile)))
(bison (package (inherit bison) (bison (package (inherit bison)
(native-inputs `(("perl" ,perl-boot0)))
(propagated-inputs `(("m4" ,m4))) (propagated-inputs `(("m4" ,m4)))
(inputs '()) ;remove Flex... (inputs '()) ;remove Flex...
(arguments '(#:tests? #f))))) ;... and thus disable tests (arguments '(#:tests? #f))))) ;... and thus disable tests
(package-with-bootstrap-guile (package
(package-with-explicit-inputs bison %boot0-inputs (inherit (package-with-bootstrap-guile
(current-source-location) (package-with-explicit-inputs bison %boot0-inputs
#:guile %bootstrap-guile)))) (current-source-location)
#:guile %bootstrap-guile)))
(native-inputs `(("perl" ,perl-boot0))))))
(define static-bash-for-glibc (define static-bash-for-glibc
;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co.
@ -444,17 +445,18 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
glibc-final-with-bootstrap-bash glibc-final-with-bootstrap-bash
(car (assoc-ref %boot1-inputs "bash")))) (car (assoc-ref %boot1-inputs "bash"))))
(bash (package (inherit static-bash) (bash (package (inherit static-bash)
(native-inputs `(("bison" ,bison-boot1)))
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
,@(package-arguments static-bash)))))) ,@(package-arguments static-bash)))))
(package-with-bootstrap-guile (inputs `(("gcc" ,gcc)
(package-with-explicit-inputs bash ("libc" ,glibc-final-with-bootstrap-bash)
`(("gcc" ,gcc) ,@(fold alist-delete %boot1-inputs
("libc" ,glibc-final-with-bootstrap-bash) '("gcc" "libc")))))
,@(fold alist-delete %boot1-inputs (package
'("gcc" "libc"))) (inherit (package-with-bootstrap-guile
(current-source-location))))) (package-with-explicit-inputs bash inputs
(current-source-location))))
(native-inputs `(("bison" ,bison-boot1))))))
(define gettext-boot0 (define gettext-boot0
;; A minimal gettext used during bootstrap. ;; A minimal gettext used during bootstrap.