~ruther/guix-local

29d37e999c495431eafde90027d2b97b16d0db4e — Ludovic Courtès 8 years ago 7349fed 
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.
patch browse .tar.gz 
1 files changed, 13 insertions(+), 11 deletions(-)

M gnu/packages/make-bootstrap.scm

M gnu/packages/make-bootstrap.scm => gnu/packages/make-bootstrap.scm +13 -11
@@ 197,6 197,18 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
				   (("/bin/sh") "sh")
				   (("execv ") "execvp "))
				 #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
                           package-with-relocatable-glibc)))
    `(,@(map (match-lambda


@@ 209,17 221,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
               ("patch" ,patch)
               ("coreutils" ,coreutils)
               ("sed" ,sed)
               ;; 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)
                          (arguments
                            (substitute-keyword-arguments (package-arguments grep)
                              ((#:phases phases)
                               `(modify-phases ,phases
                                  (delete 'fix-egrep-and-fgrep)))))))
               ("grep" ,grep)
               ("gawk" ,gawk)))
      ("bash" ,static-bash))))