[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     72584272b498433f13d5cc23f3ea83f3d5691535
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 13:21:20 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 10:31:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=72584272

scripts/bootstrap-prefix.sh: bootstrap with make-4.2.1

  glibc-2.28 requires >=make-4.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c358c0955e..b7f1815e52 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1137,7 +1137,7 @@ bootstrap_tar() {
 
 bootstrap_make() {
        MAKEOPTS= # no GNU make yet
-       bootstrap_gnu make 3.82
+       bootstrap_gnu make 4.2.1
        if [[ ${MAKE} == gmake ]] ; then
                # make make available as gmake
                ( cd ${ROOT}/tmp/usr/bin && ln -s make gmake )
@@ -1270,7 +1270,7 @@ bootstrap_stage1() {
        # packages following (e.g. zlib builds 64-bits)
 
        # don't rely on $MAKE, if make == gmake packages that call 'make' fail
-       [[ $(make --version 2>&1) == *GNU* ]] || (bootstrap_make) || return 1
+       [[ $(make --version 2>&1) == *GNU" Make "4* ]] || (bootstrap_make) || 
return 1
        [[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null || (bootstrap_wget) 
|| return 1
        [[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1
        [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1