GNU bug report logs - #25849
[PATCH] gnu: %bootstrap-coreutils&co: Patch egrep/fgrep to point to the correct grep.

Previous Next

Package: guix-patches;

Reported by: manolis837 <at> gmail.com

Date: Thu, 23 Feb 2017 11:42:02 UTC

Severity: normal

Tags: patch

Merged with 25848

Done: zimoun <zimon.toutoune <at> gmail.com>

Bug is archived. No further changes may be made.

Full log


Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: manolis837 <at> gmail.com
To: guix-patches <at> gnu.org
Cc: efraim <at> flashner.co.il, Manolis Ragkousis <manolis837 <at> gmail.com>
Subject: [PATCH] gnu: %bootstrap-coreutils&co: Patch egrep/fgrep to point to
 the correct grep.
Date: Thu, 23 Feb 2017 13:41:19 +0200
From: Manolis Ragkousis <manolis837 <at> gmail.com>

* gnu/packages/bootstrap.scm (%bootstrap-coreutils&co)[source]: Substitute the
absolute location of 'grep' with the one in /gnu/store.
---
 gnu/packages/bootstrap.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 61f1f1ab3..db7560b48 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -341,7 +341,8 @@ $out/bin/guile --version~%"
                            ;; absolute file name instead of searching for it in $PATH.
                            (if (not (elf-file? "bin/egrep"))
                              (substitute* '("bin/egrep" "bin/fgrep")
-                               (("^exec grep") (string-append (getcwd) "/bin/grep"))))
+                               (("/[^ ]+/bin/grep")
+                                (string-append out "/bin/grep"))))
                            (chmod "bin" #o555)
                            #t)))
 
-- 
2.11.1





This bug report was last modified 3 years and 142 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.