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 2C73815800D for ; Tue, 4 Jul 2023 09:37:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CDF3E07F1; Tue, 4 Jul 2023 09:37:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 4BC34E07F1 for ; Tue, 4 Jul 2023 09:37:36 +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 47B9A34092D for ; Tue, 4 Jul 2023 09:37:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9826A8DC for ; Tue, 4 Jul 2023 09:37:33 +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: <1688463397.572c1a5a03ea459d305754ccc25de70dffaaa196.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: 572c1a5a03ea459d305754ccc25de70dffaaa196 X-VCS-Branch: master Date: Tue, 4 Jul 2023 09:37:33 +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: 3de10e02-f78d-4e94-a403-e908f1e46ce3 X-Archives-Hash: e8addcb7b5566902601a4fac6f4bdd90 commit: 572c1a5a03ea459d305754ccc25de70dffaaa196 Author: Fabian Groffen gentoo org> AuthorDate: Tue Jul 4 09:36:37 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jul 4 09:36:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=572c1a5a scripts/bootstrap-prefix: use Python 3.10 on Darwin 9 Python 3.10 requires C11, which is not supported by host compiler GCC-4.0.1. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 9c86901e2e..f196eaa4b2 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -959,11 +959,19 @@ python_ver() { # 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 - echo 3.11 # keep this number in line with PV below for stage1,2 + if [[ ${CHOST} == *-darwin9 ]] ; then + echo 3.10 # last known version to compile + export PYTHON_FULL_VERSION=3.10.4 + else + echo 3.11 + export PYTHON_FULL_VERSION="3.11.3-gentoo-prefix-patched" + fi + # keep this number in line with PV below for stage1,2 } bootstrap_python() { - PV=$(python_ver).3-gentoo-prefix-patched + python_ver # to get full version + PV=${PYTHON_FULL_VERSION} A=Python-${PV}.tar.xz einfo "Bootstrapping ${A%.tar.*}" @@ -1013,8 +1021,8 @@ bootstrap_python() { -e 's/KQUEUE/KQUEUE_DISABLED/' \ configure # 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 + 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