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 DF39A1382C5 for ; Tue, 12 May 2020 14:44:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19491E0999; Tue, 12 May 2020 14:44:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 063A8E0999 for ; Tue, 12 May 2020 14:44:06 +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 EE70734FA3C for ; Tue, 12 May 2020 14:44:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5A18234 for ; Tue, 12 May 2020 14:44:04 +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: <1589294475.487ddf6654a5d25ef22f1d0a98e78d6acf0878ac.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: 487ddf6654a5d25ef22f1d0a98e78d6acf0878ac X-VCS-Branch: master Date: Tue, 12 May 2020 14:44:04 +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: 1f864fdd-5e35-4bfc-af3b-f9f75f88a8f0 X-Archives-Hash: 1e447a824ee1d7c09185e062960d2ddb commit: 487ddf6654a5d25ef22f1d0a98e78d6acf0878ac Author: Benda Xu gentoo org> AuthorDate: Tue May 12 14:41:15 2020 +0000 Commit: Benda XU gentoo org> CommitDate: Tue May 12 14:41:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=487ddf66 bootstrap-prefix.sh: bootstrap m4 on glibc-2.28 and newer. Take the patch from Gentoo tree for Stage 1, to cope with hosts having glibc-2.28 and newer. Closes: https://bugs.gentoo.org/715880 Reported-By: Xuewei Liu <18800136075 163.com> Signed-off-by: Benda Xu gentoo.org> scripts/bootstrap-prefix.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index b335ad2d90..19ad9c003a 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -831,6 +831,10 @@ bootstrap_gnu() { # recent GCC 1.4.17 and below only, on 1.4.18 this expression # doesn't match sed -i -e '/_GL_WARN_ON_USE (gets/d' lib/stdio.in.h lib/stdio.h + + # Bug 715880 + efetch http://dev.gentoo.org/~heroxbd/m4-1.4.18-glibc228.patch || return 1 + patch -p1 < "${DISTDIR}"/m4-1.4.18-glibc228.patch || return 1 fi if [[ ${PN} == "grep" ]] ; then @@ -1390,6 +1394,8 @@ bootstrap_stage1() { [[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1 type -P xz > /dev/null || (bootstrap_xz) || return 1 type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1 + [[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \ + || (bootstrap_patch) || return 1 [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1 [[ -x ${ROOT}/tmp/usr/bin/bison ]] \ || [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \ @@ -1399,8 +1405,6 @@ bootstrap_stage1() { || (bootstrap_coreutils) || return 1 [[ $(find --version 2>&1) == *GNU* ]] || (bootstrap_findutils) || return 1 [[ $(tar --version 2>&1) == *GNU* ]] || (bootstrap_tar) || return 1 - [[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \ - || (bootstrap_patch) || return 1 [[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1 [[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] \ || bootstrap_gawk || return 1