me
/
guix
Archived
1
0
Fork 0
Code

gnu: Remove dependency from gzip to the bootstrap binaries. 

* gnu/packages/base.scm (grep-final): New variable.
  (%boot5-inputs): Add it.
  (%final-inputs): Use it.
master
Ludovic Courtès 2014-06-15 11:53:02 +02:00
parent 5c860cec83
commit 09ba396c02
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/base.scm
View File

@ -1160,9 +1160,19 @@ store.")
;; test files in Gettext. ;; test files in Gettext.
#:guile guile-final))) #:guile guile-final)))
(define grep-final
;; The final grep. Gzip holds a reference to it (via zgrep), so it must be
;; built before gzip.
(package-with-bootstrap-guile
(package-with-explicit-inputs grep
%boot4-inputs
(current-source-location)
#:guile guile-final)))
(define %boot5-inputs (define %boot5-inputs
;; Now use the final Coreutils. ;; Now use the final Coreutils.
`(("coreutils" ,coreutils-final) `(("coreutils" ,coreutils-final)
("grep" ,grep-final)
,@%boot4-inputs)) ,@%boot4-inputs))
(define-public %final-inputs (define-public %final-inputs
@ -1183,9 +1193,9 @@ store.")
("diffutils" ,diffutils) ("diffutils" ,diffutils)
("patch" ,patch) ("patch" ,patch)
("sed" ,sed) ("sed" ,sed)
("grep" ,grep)
("findutils" ,findutils) ("findutils" ,findutils)
("gawk" ,gawk))) ("gawk" ,gawk)))
("grep" ,grep-final)
("coreutils" ,coreutils-final) ("coreutils" ,coreutils-final)
("make" ,gnu-make-final) ("make" ,gnu-make-final)
("bash" ,bash-final) ("bash" ,bash-final)