commit: fd2058cbd9c38988b7b58e78f1c1d214273f329c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 13:42:20 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 13:42:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fd2058cb
scripts/bootstrap-prefix: clean up m4 bootstrapping
On macOS we need a patch (no newer version exists), so add it, else we
keep on having a crashing m4.
Remove all backup versions, since patching those versions fails, so
we'll stay on the fragile path and hope this works.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 34b6c25a82..7edc5b9d3e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -856,6 +856,10 @@ bootstrap_gnu() {
# doesn't match
sed -i -e '/_GL_WARN_ON_USE (gets/d' lib/stdio.in.h lib/stdio.h
+ # macOS 10.13 have an issue with %n, which crashes m4
+ efetch
"http://rsync.prefix.bitzolder.nl/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch";
|| return 1
+ patch -p1 < "${DISTDIR}"/m4-1.4.18-darwin17-printf-n.patch ||
return 1
+
# 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
@@ -1304,10 +1308,7 @@ bootstrap_bison() {
}
bootstrap_m4() {
- bootstrap_gnu m4 1.4.18 ||
- bootstrap_gnu m4 1.4.17 ||
- bootstrap_gnu m4 1.4.16 ||
- bootstrap_gnu m4 1.4.15
+ bootstrap_gnu m4 1.4.18 # version is patched, so beware
}
bootstrap_gzip() {
