pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap: Allow overriding EGREP/FGREP.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2a9936d5fac
branches:  trunk
changeset: 426138:d2a9936d5fac
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Mar 26 15:30:27 2020 +0000

description:
bootstrap: Allow overriding EGREP/FGREP.

Makes bootstrapping on minimal Linux systems that don't include these
binaries in a normal location less broken.

from Michael Forney

diffstat:

 bootstrap/bootstrap |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r df50f6d6fe32 -r d2a9936d5fac bootstrap/bootstrap
--- a/bootstrap/bootstrap       Thu Mar 26 15:14:04 2020 +0000
+++ b/bootstrap/bootstrap       Thu Mar 26 15:30:27 2020 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.276 2020/03/22 16:40:19 rillig Exp $
+# $NetBSD: bootstrap,v 1.277 2020/03/26 15:30:27 nia Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1316,6 +1316,14 @@
        echo "TOOLS_PLATFORM.grep?=             $GREP" >> ${TARGET_MKCONF}
        echo "TOOLS_PLATFORM.grep?=             $GREP" >> ${BOOTSTRAP_MKCONF}
 fi
+if test -n "$EGREP"; then
+       echo "TOOLS_PLATFORM.egrep?=            $EGREP" >> ${TARGET_MKCONF}
+       echo "TOOLS_PLATFORM.egrep?=            $EGREP" >> ${BOOTSTRAP_MKCONF}
+fi
+if test -n "$FGREP"; then
+       echo "TOOLS_PLATFORM.fgrep?=            $FGREP" >> ${TARGET_MKCONF}
+       echo "TOOLS_PLATFORM.fgrep?=            $FGREP" >> ${BOOTSTRAP_MKCONF}
+fi
 if test -n "$ID"; then
        echo "TOOLS_PLATFORM.id?=               $ID" >> ${TARGET_MKCONF}
        echo "TOOLS_PLATFORM.id?=               $ID" >> ${BOOTSTRAP_MKCONF}



Home | Main Index | Thread Index | Old Index