01/01: gnu: make-bootstrap: Build grep without PCRE support.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 29d37e999c495431eafde90027d2b97b16d0db4e
Author: Ludovic Courtès <address@hidden>
Date:   Tue Feb 27 22:46:04 2018 +0100

    gnu: make-bootstrap: Build grep without PCRE support.
    
    Partly fixes <https://bugs.gnu.org/24841>.
    Reported by Chris Marusich <address@hidden>.
    
    This fixes cross-compilation of the statically-linked grep.
    
    * gnu/packages/make-bootstrap.scm (%static-inputs): Add 'inputs' field
    for grep.
---
 gnu/packages/make-bootstrap.scm | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 07ac936..f1c4bf7 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -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
+        ;; address@hidden 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 address@hidden 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))))