| 1 |
commit: 684d1a5c28284765b8c88c8cfab626c5c353f82b |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 4 13:33:26 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 4 13:33:26 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=684d1a5c |
| 7 |
|
| 8 |
dev-lang/python: fix install of 3.7.7 and 3.8.3 on Darwin |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.22 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/python/python-3.7.7-r2.ebuild | 5 +++-- |
| 14 |
dev-lang/python/python-3.8.3.ebuild | 5 +++-- |
| 15 |
2 files changed, 6 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/python/python-3.7.7-r2.ebuild b/dev-lang/python/python-3.7.7-r2.ebuild |
| 18 |
index b0231f6d75..812a8a668d 100644 |
| 19 |
--- a/dev-lang/python/python-3.7.7-r2.ebuild |
| 20 |
+++ b/dev-lang/python/python-3.7.7-r2.ebuild |
| 21 |
@@ -4,7 +4,7 @@ |
| 22 |
EAPI="7" |
| 23 |
WANT_LIBTOOL="none" |
| 24 |
|
| 25 |
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs |
| 26 |
+inherit autotools flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs |
| 27 |
|
| 28 |
MY_P="Python-${PV}" |
| 29 |
PYVER=$(ver_cut 1-2) |
| 30 |
@@ -143,6 +143,7 @@ src_configure() { |
| 31 |
use ssl || export PYTHON_DISABLE_SSL="1" |
| 32 |
use tk || disable+=" _tkinter" |
| 33 |
use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. |
| 34 |
+ [[ ${CHOST} == *-darwin* ]] && disable+=" _scproxy" # header issue |
| 35 |
export PYTHON_DISABLE_MODULES="${disable}" |
| 36 |
|
| 37 |
if ! use xml; then |
| 38 |
@@ -310,7 +311,7 @@ src_install() { |
| 39 |
-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" |
| 40 |
|
| 41 |
# Fix collisions between different slots of Python. |
| 42 |
- rm "${ED}/usr/$(get_libdir)/libpython3.so" || die |
| 43 |
+ rm -f "${ED}/usr/$(get_libdir)/libpython3$(get_libname)" || die |
| 44 |
|
| 45 |
# Cheap hack to get version with ABIFLAGS |
| 46 |
local abiver=$(cd "${ED}/usr/include"; echo python*) |
| 47 |
|
| 48 |
diff --git a/dev-lang/python/python-3.8.3.ebuild b/dev-lang/python/python-3.8.3.ebuild |
| 49 |
index aeaf91dca5..e17a0b7faa 100644 |
| 50 |
--- a/dev-lang/python/python-3.8.3.ebuild |
| 51 |
+++ b/dev-lang/python/python-3.8.3.ebuild |
| 52 |
@@ -4,7 +4,7 @@ |
| 53 |
EAPI="7" |
| 54 |
WANT_LIBTOOL="none" |
| 55 |
|
| 56 |
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs |
| 57 |
+inherit autotools flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs |
| 58 |
|
| 59 |
MY_P="Python-${PV}" |
| 60 |
PYVER=$(ver_cut 1-2) |
| 61 |
@@ -123,6 +123,7 @@ src_configure() { |
| 62 |
use ssl || export PYTHON_DISABLE_SSL="1" |
| 63 |
use tk || disable+=" _tkinter" |
| 64 |
use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. |
| 65 |
+ [[ ${CHOST} == *-darwin* ]] && disable+=" _scproxy" # header issue |
| 66 |
export PYTHON_DISABLE_MODULES="${disable}" |
| 67 |
|
| 68 |
if ! use xml; then |
| 69 |
@@ -289,7 +290,7 @@ src_install() { |
| 70 |
-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" |
| 71 |
|
| 72 |
# Fix collisions between different slots of Python. |
| 73 |
- rm "${ED}/usr/$(get_libdir)/libpython3.so" || die |
| 74 |
+ rm -f "${ED}/usr/$(get_libdir)/libpython3$(get_libname)" || die |
| 75 |
|
| 76 |
# Cheap hack to get version with ABIFLAGS |
| 77 |
local abiver=$(cd "${ED}/usr/include"; echo python*) |
Archives