From cfd67d36b53f920a43efe3716a1d670127310a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 14 Aug 2024 15:50:38 +0200 Subject: [PATCH] =?UTF-8?q?gnu:=20make-bootstrap:=20Fix=20statically-linke?= =?UTF-8?q?d=20=E2=80=98grep=E2=80=99=20compilation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 @@ (define %static-inputs (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