[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/07: gnu: commencement: Avoid redundant Perl rebuild.
From: |
Ludovic Courtès |
Subject: |
04/07: gnu: commencement: Avoid redundant Perl rebuild. |
Date: |
Fri, 18 Dec 2015 23:02:59 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 32243bfb57aa5d280b4949954af2df9c93b327e1
Author: Ludovic Courtès <address@hidden>
Date: Fri Dec 18 23:50:15 2015 +0100
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.
---
gnu/packages/commencement.scm | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 578ded2..7c13ecf 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -429,14 +429,15 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"address@hidden"~%"
(current-source-location)
#:guile %bootstrap-guile)))
(bison (package (inherit bison)
- (native-inputs `(("perl" ,perl-boot0)))
(propagated-inputs `(("m4" ,m4)))
(inputs '()) ;remove Flex...
(arguments '(#:tests? #f))))) ;... and thus disable tests
- (package-with-bootstrap-guile
- (package-with-explicit-inputs bison %boot0-inputs
- (current-source-location)
- #:guile %bootstrap-guile))))
+ (package
+ (inherit (package-with-bootstrap-guile
+ (package-with-explicit-inputs bison %boot0-inputs
+ (current-source-location)
+ #:guile %bootstrap-guile)))
+ (native-inputs `(("perl" ,perl-boot0))))))
(define static-bash-for-glibc
;; 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
\"address@hidden"~%"
glibc-final-with-bootstrap-bash
(car (assoc-ref %boot1-inputs "bash"))))
(bash (package (inherit static-bash)
- (native-inputs `(("bison" ,bison-boot1)))
(arguments
`(#:guile ,%bootstrap-guile
- ,@(package-arguments static-bash))))))
- (package-with-bootstrap-guile
- (package-with-explicit-inputs bash
- `(("gcc" ,gcc)
- ("libc" ,glibc-final-with-bootstrap-bash)
- ,@(fold alist-delete %boot1-inputs
- '("gcc" "libc")))
- (current-source-location)))))
+ ,@(package-arguments static-bash)))))
+ (inputs `(("gcc" ,gcc)
+ ("libc" ,glibc-final-with-bootstrap-bash)
+ ,@(fold alist-delete %boot1-inputs
+ '("gcc" "libc")))))
+ (package
+ (inherit (package-with-bootstrap-guile
+ (package-with-explicit-inputs bash inputs
+ (current-source-location))))
+ (native-inputs `(("bison" ,bison-boot1))))))
(define gettext-boot0
;; A minimal gettext used during bootstrap.
- branch core-updates updated (c5b65f7 -> 53088d0), Ludovic Courtès, 2015/12/18
- 03/07: gnu: commencement: Add "-boot0" to early packages., Ludovic Courtès, 2015/12/18
- 05/07: gnu: commencement: Build the final Bash with "bison-boot1"., Ludovic Courtès, 2015/12/18
- 01/07: gnu: commencement: Use GMP 6.0.0a for bootstrapping., Ludovic Courtès, 2015/12/18
- 06/07: build-system/gnu: Always pass "-D" to strip/objcopy., Ludovic Courtès, 2015/12/18
- 02/07: gnu: gcc: Prefer language-specific variables over 'CPATH'., Ludovic Courtès, 2015/12/18
- 04/07: gnu: commencement: Avoid redundant Perl rebuild.,
Ludovic Courtès <=
- 07/07: gnu: commencement: Build Bison deterministically., Ludovic Courtès, 2015/12/18