| 1 |
commit: 487ddf6654a5d25ef22f1d0a98e78d6acf0878ac |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 12 14:41:15 2020 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 12 14:41:15 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=487ddf66 |
| 7 |
|
| 8 |
bootstrap-prefix.sh: bootstrap m4 on glibc-2.28 and newer. |
| 9 |
|
| 10 |
Take the patch from Gentoo tree for Stage 1, to cope with hosts having |
| 11 |
glibc-2.28 and newer. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/715880 |
| 14 |
Reported-By: Xuewei Liu <18800136075 <AT> 163.com> |
| 15 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 16 |
|
| 17 |
scripts/bootstrap-prefix.sh | 8 ++++++-- |
| 18 |
1 file changed, 6 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 21 |
index b335ad2d90..19ad9c003a 100755 |
| 22 |
--- a/scripts/bootstrap-prefix.sh |
| 23 |
+++ b/scripts/bootstrap-prefix.sh |
| 24 |
@@ -831,6 +831,10 @@ bootstrap_gnu() { |
| 25 |
# recent GCC 1.4.17 and below only, on 1.4.18 this expression |
| 26 |
# doesn't match |
| 27 |
sed -i -e '/_GL_WARN_ON_USE (gets/d' lib/stdio.in.h lib/stdio.h |
| 28 |
+ |
| 29 |
+ # Bug 715880 |
| 30 |
+ efetch http://dev.gentoo.org/~heroxbd/m4-1.4.18-glibc228.patch || return 1 |
| 31 |
+ patch -p1 < "${DISTDIR}"/m4-1.4.18-glibc228.patch || return 1 |
| 32 |
fi |
| 33 |
|
| 34 |
if [[ ${PN} == "grep" ]] ; then |
| 35 |
@@ -1390,6 +1394,8 @@ bootstrap_stage1() { |
| 36 |
[[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1 |
| 37 |
type -P xz > /dev/null || (bootstrap_xz) || return 1 |
| 38 |
type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1 |
| 39 |
+ [[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \ |
| 40 |
+ || (bootstrap_patch) || return 1 |
| 41 |
[[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1 |
| 42 |
[[ -x ${ROOT}/tmp/usr/bin/bison ]] \ |
| 43 |
|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \ |
| 44 |
@@ -1399,8 +1405,6 @@ bootstrap_stage1() { |
| 45 |
|| (bootstrap_coreutils) || return 1 |
| 46 |
[[ $(find --version 2>&1) == *GNU* ]] || (bootstrap_findutils) || return 1 |
| 47 |
[[ $(tar --version 2>&1) == *GNU* ]] || (bootstrap_tar) || return 1 |
| 48 |
- [[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \ |
| 49 |
- || (bootstrap_patch) || return 1 |
| 50 |
[[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1 |
| 51 |
[[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] \ |
| 52 |
|| bootstrap_gawk || return 1 |
Archives