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 CDC5C13835A for ; Sat, 21 Nov 2020 13:45:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0B3CE07AE; Sat, 21 Nov 2020 13:45:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D6431E07AE for ; Sat, 21 Nov 2020 13:45:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 869F8340DF5 for ; Sat, 21 Nov 2020 13:45:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 796AD44C for ; Sat, 21 Nov 2020 13:45:32 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1605966140.fd2058cbd9c38988b7b58e78f1c1d214273f329c.grobian@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: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: fd2058cbd9c38988b7b58e78f1c1d214273f329c X-VCS-Branch: master Date: Sat, 21 Nov 2020 13:45:32 +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: 86867d93-57cf-4ef9-bacf-e2ad1eaa21ca X-Archives-Hash: 25981806f6f342db8c2fb8a128a39bc3 commit: fd2058cbd9c38988b7b58e78f1c1d214273f329c Author: Fabian Groffen gentoo org> AuthorDate: Sat Nov 21 13:42:20 2020 +0000 Commit: Fabian Groffen gentoo 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 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() {