From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: [PATCH 2/6] gnu: %bootstrap-coreutils&co: Patch egrep/fgrep to work regardless of $PATH. Date: Thu, 9 Feb 2017 20:45:06 +0200 Message-ID: <20170209184510.24200-3-efraim@flashner.co.il> References: <20170209184510.24200-1-efraim@flashner.co.il> Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbtix-00030H-10 for guix-devel@gnu.org; Thu, 09 Feb 2017 13:45:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cbtit-0003B3-2w for guix-devel@gnu.org; Thu, 09 Feb 2017 13:45:43 -0500 Received: from flashner.co.il ([178.62.234.194]:55239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbtis-0003Al-LN for guix-devel@gnu.org; Thu, 09 Feb 2017 13:45:38 -0500 Received: from localhost (85.64.232.168.dynamic.barak-online.net [85.64.232.168]) by flashner.co.il (Postfix) with ESMTPSA id 6347240077 for ; Thu, 9 Feb 2017 18:45:37 +0000 (UTC) In-Reply-To: <20170209184510.24200-1-efraim@flashner.co.il> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org This is the bootstrap version of 1063d325ea76aa2b00dfcd3d436b16e412103df1 * gnu/packages/bootstrap.scm (%bootstrap-coreutils&co)[source]: Patch the absolute location of 'grep' when called from 'egrep' or 'fgrep'. --- gnu/packages/bootstrap.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3be6e1246..1dd853260 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -325,6 +325,10 @@ $out/bin/guile --version~%" (chmod "bin" #o755) (patch-shebang "bin/egrep" path) (patch-shebang "bin/fgrep" path) + ;; Patch 'egrep' and 'fgrep' to execute 'grep= ' via its + ;; absolute file name instead of searching fo= r it in $PATH. + (substitute* '("bin/egrep" "bin/fgrep") + (("grep") (string-append (getcwd) "/bin/gre= p"))) (chmod "bin" #o555) #t))) =20 --=20 2.11.1