gnu: make-bootstrap: Build grep without PCRE support.
Partly fixes <https://bugs.gnu.org/24841>. Reported by Chris Marusich <cmmarusich@gmail.com>. This fixes cross-compilation of the statically-linked grep. * gnu/packages/make-bootstrap.scm (%static-inputs): Add 'inputs' field for grep.master
parent
7349fed591
commit
29d37e999c
|
@ -197,6 +197,18 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
(("/bin/sh") "sh")
|
(("/bin/sh") "sh")
|
||||||
(("execv ") "execvp "))
|
(("execv ") "execvp "))
|
||||||
#t)))))))
|
#t)))))))
|
||||||
|
;; We don't want to retain a reference to /gnu/store in the bootstrap
|
||||||
|
;; versions of egrep/fgrep, so we remove the custom phase added since
|
||||||
|
;; grep@2.25. The effect is 'egrep' and 'fgrep' look for 'grep' in
|
||||||
|
;; $PATH.
|
||||||
|
(grep (package
|
||||||
|
(inherit grep)
|
||||||
|
(inputs '()) ;remove PCRE, which is optional
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments grep)
|
||||||
|
((#:phases phases)
|
||||||
|
`(modify-phases ,phases
|
||||||
|
(delete 'fix-egrep-and-fgrep)))))))
|
||||||
(finalize (compose static-package
|
(finalize (compose static-package
|
||||||
package-with-relocatable-glibc)))
|
package-with-relocatable-glibc)))
|
||||||
`(,@(map (match-lambda
|
`(,@(map (match-lambda
|
||||||
|
@ -209,17 +221,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
("patch" ,patch)
|
("patch" ,patch)
|
||||||
("coreutils" ,coreutils)
|
("coreutils" ,coreutils)
|
||||||
("sed" ,sed)
|
("sed" ,sed)
|
||||||
;; We don't want to retain a reference to /gnu/store in the
|
("grep" ,grep)
|
||||||
;; bootstrap versions of egrep/fgrep, so we remove the custom
|
|
||||||
;; phase added since grep@2.25. The effect is 'egrep' and
|
|
||||||
;; 'fgrep' look for 'grep' in $PATH.
|
|
||||||
("grep" ,(package
|
|
||||||
(inherit grep)
|
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments (package-arguments grep)
|
|
||||||
((#:phases phases)
|
|
||||||
`(modify-phases ,phases
|
|
||||||
(delete 'fix-egrep-and-fgrep)))))))
|
|
||||||
("gawk" ,gawk)))
|
("gawk" ,gawk)))
|
||||||
("bash" ,static-bash))))
|
("bash" ,static-bash))))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue