commit: 572c1a5a03ea459d305754ccc25de70dffaaa196
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 4 09:36:37 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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
