commit: 7d221e93950a2f499f3f5b9766be2874530498b0 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jun 7 07:52:45 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jun 7 08:44:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d221e93
dev-lang/python: Remove USE=jit from freethreading versions So apparently USE=jit cannot be enabled along with freethreading: ``` checking for --enable-experimental-jit... -D_Py_TIER2=1 -D_Py_JIT configure: error: --enable-experimental-jit cannot be used with --disable-gil. ``` Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/42479 Closes: https://github.com/gentoo/gentoo/pull/42479 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-lang/python/python-0.3.13.3_p2.ebuild | 15 ++------------- dev-lang/python/python-0.3.13.4.ebuild | 15 ++------------- dev-lang/python/python-0.3.13.9999.ebuild | 15 ++------------- dev-lang/python/python-0.3.14.0_beta2_p1.ebuild | 15 ++------------- dev-lang/python/python-0.3.14.9999.ebuild | 15 ++------------- dev-lang/python/python-0.3.15.9999.ebuild | 15 ++------------- 6 files changed, 12 insertions(+), 78 deletions(-) diff --git a/dev-lang/python/python-0.3.13.3_p2.ebuild b/dev-lang/python/python-0.3.13.3_p2.ebuild index 061ca71e51c1..a600e6a8b9c0 100644 --- a/dev-lang/python/python-0.3.13.3_p2.ebuild +++ b/dev-lang/python/python-0.3.13.3_p2.ebuild @@ -3,11 +3,9 @@ EAPI="8" -LLVM_COMPAT=( 18 ) -LLVM_OPTIONAL=1 WANT_LIBTOOL="none" -inherit autotools check-reqs flag-o-matic linux-info llvm-r1 +inherit autotools check-reqs flag-o-matic linux-info inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs inherit verify-sig @@ -35,10 +33,9 @@ LICENSE="PSF-2" SLOT="${PYVER}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE=" - bluetooth build debug +ensurepip examples gdbm jit + bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind " -REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -89,12 +86,6 @@ BDEPEND=" dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig - jit? ( - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} - ') - ) verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) " RDEPEND+=" @@ -134,7 +125,6 @@ pkg_pretend() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then - use jit && llvm-r1_pkg_setup if use test || use pgo; then check-reqs_pkg_setup @@ -415,7 +405,6 @@ src_configure() { --disable-gil $(use_with debug assertions) - $(use_enable jit experimental-jit) $(use_enable pgo optimizations) $(use_with readline readline "$(usex libedit editline readline)") $(use_with valgrind) diff --git a/dev-lang/python/python-0.3.13.4.ebuild b/dev-lang/python/python-0.3.13.4.ebuild index 061ca71e51c1..a600e6a8b9c0 100644 --- a/dev-lang/python/python-0.3.13.4.ebuild +++ b/dev-lang/python/python-0.3.13.4.ebuild @@ -3,11 +3,9 @@ EAPI="8" -LLVM_COMPAT=( 18 ) -LLVM_OPTIONAL=1 WANT_LIBTOOL="none" -inherit autotools check-reqs flag-o-matic linux-info llvm-r1 +inherit autotools check-reqs flag-o-matic linux-info inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs inherit verify-sig @@ -35,10 +33,9 @@ LICENSE="PSF-2" SLOT="${PYVER}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE=" - bluetooth build debug +ensurepip examples gdbm jit + bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind " -REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -89,12 +86,6 @@ BDEPEND=" dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig - jit? ( - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} - ') - ) verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) " RDEPEND+=" @@ -134,7 +125,6 @@ pkg_pretend() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then - use jit && llvm-r1_pkg_setup if use test || use pgo; then check-reqs_pkg_setup @@ -415,7 +405,6 @@ src_configure() { --disable-gil $(use_with debug assertions) - $(use_enable jit experimental-jit) $(use_enable pgo optimizations) $(use_with readline readline "$(usex libedit editline readline)") $(use_with valgrind) diff --git a/dev-lang/python/python-0.3.13.9999.ebuild b/dev-lang/python/python-0.3.13.9999.ebuild index a2cab32eb8c5..a1df03efb43d 100644 --- a/dev-lang/python/python-0.3.13.9999.ebuild +++ b/dev-lang/python/python-0.3.13.9999.ebuild @@ -3,11 +3,9 @@ EAPI="8" -LLVM_COMPAT=( 18 ) -LLVM_OPTIONAL=1 WANT_LIBTOOL="none" -inherit autotools check-reqs flag-o-matic git-r3 linux-info llvm-r1 +inherit autotools check-reqs flag-o-matic git-r3 linux-info inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs PYVER="$(ver_cut 2-3)t" @@ -27,10 +25,9 @@ EGIT_BRANCH=${PYVER%t} LICENSE="PSF-2" SLOT="${PYVER}" IUSE=" - bluetooth build debug +ensurepip examples gdbm jit + bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind " -REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -81,12 +78,6 @@ BDEPEND=" dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig - jit? ( - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} - ') - ) " RDEPEND+=" !build? ( app-misc/mime-types ) @@ -123,7 +114,6 @@ pkg_pretend() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then - use jit && llvm-r1_pkg_setup if use test || use pgo; then check-reqs_pkg_setup @@ -402,7 +392,6 @@ src_configure() { --disable-gil $(use_with debug assertions) - $(use_enable jit experimental-jit) $(use_enable pgo optimizations) $(use_with readline readline "$(usex libedit editline readline)") $(use_with valgrind) diff --git a/dev-lang/python/python-0.3.14.0_beta2_p1.ebuild b/dev-lang/python/python-0.3.14.0_beta2_p1.ebuild index bddc1e3c60f4..c5ef5b138ba7 100644 --- a/dev-lang/python/python-0.3.14.0_beta2_p1.ebuild +++ b/dev-lang/python/python-0.3.14.0_beta2_p1.ebuild @@ -3,12 +3,10 @@ EAPI="8" -LLVM_COMPAT=( 19 ) -LLVM_OPTIONAL=1 VERIFY_SIG_METHOD=sigstore WANT_LIBTOOL="none" -inherit autotools check-reqs flag-o-matic linux-info llvm-r1 +inherit autotools check-reqs flag-o-matic linux-info inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs inherit verify-sig @@ -36,10 +34,9 @@ LICENSE="PSF-2" SLOT="${PYVER}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE=" - bluetooth build debug +ensurepip examples gdbm jit + bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl tail-call-interp test tk valgrind " -REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -90,12 +87,6 @@ BDEPEND=" dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig - jit? ( - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} - ') - ) " RDEPEND+=" !build? ( app-misc/mime-types ) @@ -136,7 +127,6 @@ pkg_pretend() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then - use jit && llvm-r1_pkg_setup if use test || use pgo; then check-reqs_pkg_setup @@ -417,7 +407,6 @@ src_configure() { --disable-gil $(use_with debug assertions) - $(use_enable jit experimental-jit) $(use_enable pgo optimizations) $(use_with readline readline "$(usex libedit editline readline)") $(use_with tail-call-interp) diff --git a/dev-lang/python/python-0.3.14.9999.ebuild b/dev-lang/python/python-0.3.14.9999.ebuild index 4a0dc2082ce6..2989e4a2f708 100644 --- a/dev-lang/python/python-0.3.14.9999.ebuild +++ b/dev-lang/python/python-0.3.14.9999.ebuild @@ -3,11 +3,9 @@ EAPI="8" -LLVM_COMPAT=( 19 ) -LLVM_OPTIONAL=1 WANT_LIBTOOL="none" -inherit autotools check-reqs flag-o-matic git-r3 linux-info llvm-r1 +inherit autotools check-reqs flag-o-matic git-r3 linux-info inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs PYVER="$(ver_cut 2-3)t" @@ -27,10 +25,9 @@ EGIT_BRANCH=${PYVER%t} LICENSE="PSF-2" SLOT="${PYVER}" IUSE=" - bluetooth build debug +ensurepip examples gdbm jit + bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl tail-call-interp test tk valgrind " -REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -81,12 +78,6 @@ BDEPEND=" dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig - jit? ( - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} - ') - ) " RDEPEND+=" !build? ( app-misc/mime-types ) @@ -123,7 +114,6 @@ pkg_pretend() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then - use jit && llvm-r1_pkg_setup if use test || use pgo; then check-reqs_pkg_setup @@ -402,7 +392,6 @@ src_configure() { --disable-gil $(use_with debug assertions) - $(use_enable jit experimental-jit) $(use_enable pgo optimizations) $(use_with readline readline "$(usex libedit editline readline)") $(use_with tail-call-interp) diff --git a/dev-lang/python/python-0.3.15.9999.ebuild b/dev-lang/python/python-0.3.15.9999.ebuild index bd82716f1d5a..bdac07b36010 100644 --- a/dev-lang/python/python-0.3.15.9999.ebuild +++ b/dev-lang/python/python-0.3.15.9999.ebuild @@ -3,11 +3,9 @@ EAPI="8" -LLVM_COMPAT=( 19 ) -LLVM_OPTIONAL=1 WANT_LIBTOOL="none" -inherit autotools check-reqs flag-o-matic git-r3 linux-info llvm-r1 +inherit autotools check-reqs flag-o-matic git-r3 linux-info inherit multiprocessing pax-utils toolchain-funcs PYVER="$(ver_cut 2-3)t" @@ -26,10 +24,9 @@ EGIT_REPO_URI="https://github.com/python/cpython.git"; LICENSE="PSF-2" SLOT="${PYVER}" IUSE=" - bluetooth build debug +ensurepip examples gdbm jit + bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl tail-call-interp test tk valgrind " -REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -80,12 +77,6 @@ BDEPEND=" dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig - jit? ( - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} - ') - ) " RDEPEND+=" !build? ( app-misc/mime-types ) @@ -117,7 +108,6 @@ pkg_pretend() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then - use jit && llvm-r1_pkg_setup if use test || use pgo; then check-reqs_pkg_setup @@ -396,7 +386,6 @@ src_configure() { --disable-gil $(use_with debug assertions) - $(use_enable jit experimental-jit) $(use_enable pgo optimizations) $(use_with readline readline "$(usex libedit editline readline)") $(use_with tail-call-interp)
