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 C4FC0158649 for ; Tue, 9 May 2023 06:28:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06FFFE085E; Tue, 9 May 2023 06:28:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 D84FDE085E for ; Tue, 9 May 2023 06:28:09 +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 F0610340E03 for ; Tue, 9 May 2023 06:28:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60AF0A34 for ; Tue, 9 May 2023 06:28:07 +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: <1683613667.64d82803742b7e7751241dc3dc6e81f4f956880c.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: 64d82803742b7e7751241dc3dc6e81f4f956880c X-VCS-Branch: master Date: Tue, 9 May 2023 06:28:07 +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: c4168184-aec2-47cf-9eb5-0f1a35f12c22 X-Archives-Hash: 1ba8f3f145597556127bbd065b1d969e commit: 64d82803742b7e7751241dc3dc6e81f4f956880c Author: Fabian Groffen gentoo org> AuthorDate: Tue May 9 06:27:47 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue May 9 06:27:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=64d82803 scripts/bootstrap-prefix: switch bootstrap to Python 3.11 Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 7fe3ce7808..2208935e1b 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -993,10 +993,15 @@ bootstrap_gnu() { } python_ver() { + # keep this number in line with PV below for stage1,2 + # also, note that this version must match the Python version in the + # snapshot for stage3, else packages will break with some python + # mismatch error due to Portage using a different version after it + # upgraded itself with a newer Python if [[ ${CHOST} == *-cygwin* ]] ; then echo 3.9 # keep this number in line with PV below for stage1,2 else - echo 3.10 # keep this number in line with PV below for stage1,2 + echo 3.11 # keep this number in line with PV below for stage1,2 fi } @@ -1004,12 +1009,16 @@ bootstrap_python() { if [[ ${CHOST} == *-cygwin* ]] ; then PV=$(python_ver).10 else - PV=$(python_ver).4 + PV=$(python_ver).3-gentoo-prefix-patched fi A=Python-${PV}.tar.xz einfo "Bootstrapping ${A%.tar.*}" - efetch https://www.python.org/ftp/python/${PV}/${A} + if [[ ${PV} == *-gentoo-prefix-patched ]] ; then + efetch https://dev.gentoo.org/~grobian/distfiles/${A} + else + efetch https://www.python.org/ftp/python/${PV}/${A} + fi einfo "Unpacking ${A%.tar.*}" export S="${PORTAGE_TMPDIR}/python-${PV}" @@ -1022,7 +1031,7 @@ bootstrap_python() { *) einfo "Don't know to unpack ${A}" ;; esac [[ ${PIPESTATUS[*]} == '0 0' ]] || return 1 - S="${S}"/Python-${PV} + S="${S}"/Python-${PV%%-*} cd "${S}" rm -rf Modules/_ctypes/libffi* || return 1 rm -rf Modules/zlib || return 1 @@ -1068,6 +1077,10 @@ bootstrap_python() { -e '/^#define Py_HUGE_VAL/s/HUGE_VAL$/(__builtin_huge_val())/' \ -e '/defined HAVE_DECL_ISNAN/s/ISNAN/USE_FALLBACK/' \ Include/pymath.h + # OpenIndiana/Solaris 11 defines inet_aton no longer in + # libresolv, so use hstrerror to check if we need -lresolv + sed -i -e '/AC_CHECK_LIB/s/inet_aton/hstrerror/' \ + configure || die ;; (*-darwin9) # Darwin 9's kqueue seems to act up (at least at this stage), so @@ -1076,9 +1089,9 @@ bootstrap_python() { sed -i \ -e 's/KQUEUE/KQUEUE_DISABLED/' \ configure - # fixup thread id detection - efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch" - patch -p1 < "${DISTDIR}"/python-3.9.6-darwin9_pthreadid.patch + # fixup thread id detection (only needed on vanilla Python tar) + #efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch" + #patch -p1 < "${DISTDIR}"/python-3.9.6-darwin9_pthreadid.patch ;; (*-openbsd*) # OpenBSD is not a multilib system