me/guix
Archived
1
0
Fork 0
Code Activity

gnu: commencement: Remove 'm4-boot0*'.

Browse source 
* gnu/packages/commencement.scm (m4-boot0*): Remove.
(bison-boot0, flex-boot0): Use M4-BOOT0 instead.
This commit is contained in:
Ludovic Courtès 2019-10-14 15:37:25 +02:00
parent c206f1914e
commit 57bc2dcf0b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/commencement.scm
View file

@ -1716,12 +1716,6 @@ exec " gcc "/bin/" program
#:implicit-inputs? #f #:implicit-inputs? #f
,@(package-arguments m4))))) ,@(package-arguments m4)))))
(define m4-boot0*
(package
;; TODO: On the next rebuild cycle, use M4-BOOT0 as is.
(inherit m4-boot0)
(name "m4")))
(define bison-boot0 (define bison-boot0
;; This Bison is needed to build MiG so we need it early in the process. ;; This Bison is needed to build MiG so we need it early in the process.
;; Recent versions of Linux-Libre headers also depend on this. ;; Recent versions of Linux-Libre headers also depend on this.
@ -1729,7 +1723,7 @@ exec " gcc "/bin/" program
(inherit bison) (inherit bison)
;; TODO: On the next build cycle, do: ;; TODO: On the next build cycle, do:
;;(name "bison-boot0") ;;(name "bison-boot0")
(propagated-inputs `(("m4" ,m4-boot0*))) (propagated-inputs `(("m4" ,m4-boot0)))
(native-inputs `(("perl" ,perl-boot0))) (native-inputs `(("perl" ,perl-boot0)))
(inputs (%boot0-inputs)) ;remove Flex... (inputs (%boot0-inputs)) ;remove Flex...
(arguments (arguments
@ -1765,12 +1759,7 @@ exec " gcc "/bin/" program
(package (package
(inherit flex) (inherit flex)
(native-inputs `(("bison" ,bison-boot0))) (native-inputs `(("bison" ,bison-boot0)))
(propagated-inputs (propagated-inputs `(("m4" ,m4-boot0)))
;; XXX: Here we use an 'm4-boot0' package that's not eq? so that it
;; appears twice in '%build-inputs', like when we were using
;; 'package-with-explicit-inputs'.
;; TODO: Remove this hack on the next rebuild cycle.
`(("m4" ,(package (inherit m4-boot0*)))))
(inputs (%boot0-inputs)) (inputs (%boot0-inputs))
(arguments (arguments
`(#:implicit-inputs? #f `(#:implicit-inputs? #f