| 1 |
commit: 742eeca02a0d06a56f6a69af55bcbcdf42f18ba1 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 31 08:22:13 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 31 08:43:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742eeca0 |
| 7 |
|
| 8 |
dev-lang/python: Enable threads unconditionally in <3.7 too |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-lang/python/python-2.7.18_p12.ebuild | 7 +++---- |
| 13 |
dev-lang/python/python-3.6.14_p1.ebuild | 7 +++---- |
| 14 |
2 files changed, 6 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/python/python-2.7.18_p12.ebuild b/dev-lang/python/python-2.7.18_p12.ebuild |
| 17 |
index 8d7d4c785d8..0c975e2caf7 100644 |
| 18 |
--- a/dev-lang/python/python-2.7.18_p12.ebuild |
| 19 |
+++ b/dev-lang/python/python-2.7.18_p12.ebuild |
| 20 |
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}" |
| 21 |
LICENSE="PSF-2" |
| 22 |
SLOT="${PYVER}" |
| 23 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 24 |
-IUSE="berkdb bluetooth build elibc_uclibc examples gdbm hardened +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml" |
| 25 |
+IUSE="berkdb bluetooth build elibc_uclibc examples gdbm hardened +ncurses +readline +sqlite +ssl tk +wide-unicode wininst +xml" |
| 26 |
|
| 27 |
# Do not add a dependency on dev-lang/python to this ebuild. |
| 28 |
# If you need to apply a patch which requires python for bootstrapping, please |
| 29 |
@@ -191,7 +191,7 @@ src_configure() { |
| 30 |
--with-fpectl |
| 31 |
--enable-shared |
| 32 |
--enable-ipv6 |
| 33 |
- $(use_with threads) |
| 34 |
+ --with-threads |
| 35 |
$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") |
| 36 |
--infodir='${prefix}/share/info' |
| 37 |
--mandir='${prefix}/share/man' |
| 38 |
@@ -206,7 +206,7 @@ src_configure() { |
| 39 |
|
| 40 |
OPT="" econf "${myeconfargs[@]}" |
| 41 |
|
| 42 |
- if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then |
| 43 |
+ if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then |
| 44 |
eerror "configure has detected that the sem_open function is broken." |
| 45 |
eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." |
| 46 |
die "Broken sem_open function (bug 496328)" |
| 47 |
@@ -293,7 +293,6 @@ src_install() { |
| 48 |
use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die |
| 49 |
use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test} |
| 50 |
|
| 51 |
- use threads || rm -r "${libdir}/multiprocessing" || die |
| 52 |
use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die |
| 53 |
|
| 54 |
dodoc Misc/{ACKS,HISTORY,NEWS} |
| 55 |
|
| 56 |
diff --git a/dev-lang/python/python-3.6.14_p1.ebuild b/dev-lang/python/python-3.6.14_p1.ebuild |
| 57 |
index cba6bb86484..54ae5943f02 100644 |
| 58 |
--- a/dev-lang/python/python-3.6.14_p1.ebuild |
| 59 |
+++ b/dev-lang/python/python-3.6.14_p1.ebuild |
| 60 |
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}" |
| 61 |
LICENSE="PSF-2" |
| 62 |
SLOT="${PYVER}/${PYVER}m" |
| 63 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
| 64 |
-IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test +threads tk wininst +xml" |
| 65 |
+IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml" |
| 66 |
RESTRICT="!test? ( test )" |
| 67 |
|
| 68 |
# Do not add a dependency on dev-lang/python to this ebuild. |
| 69 |
@@ -152,7 +152,7 @@ src_configure() { |
| 70 |
--with-fpectl |
| 71 |
--enable-shared |
| 72 |
--enable-ipv6 |
| 73 |
- $(use_with threads) |
| 74 |
+ --with-threads |
| 75 |
--infodir='${prefix}/share/info' |
| 76 |
--mandir='${prefix}/share/man' |
| 77 |
--with-computed-gotos |
| 78 |
@@ -166,7 +166,7 @@ src_configure() { |
| 79 |
|
| 80 |
OPT="" econf "${myeconfargs[@]}" |
| 81 |
|
| 82 |
- if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then |
| 83 |
+ if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then |
| 84 |
eerror "configure has detected that the sem_open function is broken." |
| 85 |
eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." |
| 86 |
die "Broken sem_open function (bug 496328)" |
| 87 |
@@ -269,7 +269,6 @@ src_install() { |
| 88 |
use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die |
| 89 |
use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die |
| 90 |
|
| 91 |
- use threads || rm -r "${libdir}/multiprocessing" || die |
| 92 |
use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die |
| 93 |
|
| 94 |
dodoc Misc/{ACKS,HISTORY,NEWS} |
Archives