From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 529CC138334 for ; Sun, 23 Dec 2018 10:32:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A59EE0B1A; Sun, 23 Dec 2018 10:32:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F3318E0A53 for ; Sun, 23 Dec 2018 10:32:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB633335C5D for ; Sun, 23 Dec 2018 10:32:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BE6645B for ; Sun, 23 Dec 2018 10:32:53 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1545561107.72584272b498433f13d5cc23f3ea83f3d5691535.heroxbd@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 72584272b498433f13d5cc23f3ea83f3d5691535 X-VCS-Branch: master Date: Sun, 23 Dec 2018 10:32:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 87359a1f-783e-4905-ad7d-c22ec62d1cc2 X-Archives-Hash: ad103f469ef24d117b3e9b7aab472625 commit: 72584272b498433f13d5cc23f3ea83f3d5691535 Author: Benda Xu gentoo org> AuthorDate: Thu Dec 20 13:21:20 2018 +0000 Commit: Benda XU gentoo 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 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