amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Ludovic Courtès 2024-08-14 15:50:38 +02:00
parent 9fe0e5b353
commit cfd67d36b5
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/make-bootstrap.scm
View file

@ -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