02/02: gnu: make-bootstrap: Fix statically-linked ‘grep’ compilation.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 6fe957f749bc500bce49e4fa1cfa4d8c32227f32
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Wed Aug 14 15:50:38 2024 +0200

    gnu: make-bootstrap: Fix statically-linked ‘grep’ compilation.
    
    The ‘%static-inputs’ list is used by ‘bootstrap-tarballs’ for systems
    other than x86_64-linux and i686-linux.
    
    * gnu/packages/make-bootstrap.scm (%static-inputs): Pass
    ‘--disable-perl-regexp’ and remove ‘--enable-perl-regexp’ for grep.
    
    Change-Id: Id9cc8c026eee5031b00c1824624fe6da205d55eb
---
 gnu/packages/make-bootstrap.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 13cf40d37b..d5b6b818b3 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -267,9 +267,12 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                 (inputs '())                   ;remove PCRE, which is optional
                 (arguments
                  (substitute-keyword-arguments (package-arguments grep)
+                   ((#:configure-flags flags #~'())
+                    #~(cons "--disable-perl-regexp"
+                            (delete "--enable-perl-regexp" #$flags)))
                    ((#:phases phases)
-                    `(modify-phases ,phases
-                       (delete 'fix-egrep-and-fgrep)))))))
+                    #~(modify-phases #$phases
+                        (delete 'fix-egrep-and-fgrep)))))))
         (finalize (compose static-package
                            package-with-relocatable-glibc)))
     (append (map finalize