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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B223115808C for ; Mon, 14 Mar 2022 17:32:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D368BE097A; Mon, 14 Mar 2022 17:32:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8ECCE097A for ; Mon, 14 Mar 2022 17:32:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3A0D342BCF for ; Mon, 14 Mar 2022 17:32:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27346310 for ; Mon, 14 Mar 2022 17:32:26 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1647279102.387601ab22030d12bfa9cb819c6c88f10c28965e.sam@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: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 387601ab22030d12bfa9cb819c6c88f10c28965e X-VCS-Branch: master Date: Mon, 14 Mar 2022 17:32:26 +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: 858996cc-9439-49e6-889b-50d1ab04b73d X-Archives-Hash: 33e341eb77787493630712a9538839d4 commit: 387601ab22030d12bfa9cb819c6c88f10c28965e Author: Sam James gentoo org> AuthorDate: Mon Mar 14 17:31:42 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 14 17:31:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=387601ab bootstrap-prefix.sh: try m4 1.4.19 (for glibc-2.34 fix) m4 1.4.19 has a glibc-2.34 fix we need to fix bootstraps w/ newer glibc on host. We don't apply older patches to this version but ew should fall back to 1.4.18 if the build fails anyway (the patches don't seem to be needed now, at least the gnulib-ish one). Signed-off-by: Sam James gentoo.org> scripts/bootstrap-prefix.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index a9b5635c4c..6bb4e5e439 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -913,13 +913,15 @@ 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 + if [[ ${PV} == "1.4.18" ]] ; then + # 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 + fi fi fix_config_sub @@ -1413,7 +1415,7 @@ bootstrap_bison() { } bootstrap_m4() { - bootstrap_gnu m4 1.4.18 # version is patched, so beware + bootstrap_gnu m4 1.4.19 || bootstrap_gnu m4 1.4.18 # version is patched, so beware } bootstrap_gzip() {