diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2020-06-04 15:33:26 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2020-06-04 15:33:26 +0200 |
| commit | 684d1a5c28284765b8c88c8cfab626c5c353f82b (patch) | |
| tree | 39d47082cf003e31cfdff5aa083c1e13803c53ca | |
| parent | dev-lang/python: attempt to fix Darwin compile for 3.7.7 and 3.8.3 (diff) | |
| download | prefix-684d1a5c28284765b8c88c8cfab626c5c353f82b.tar.gz prefix-684d1a5c28284765b8c88c8cfab626c5c353f82b.tar.bz2 prefix-684d1a5c28284765b8c88c8cfab626c5c353f82b.zip | |
dev-lang/python: fix install of 3.7.7 and 3.8.3 on Darwin
Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rw-r--r-- | dev-lang/python/python-3.7.7-r2.ebuild | 5 | ||||
| -rw-r--r-- | dev-lang/python/python-3.8.3.ebuild | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/dev-lang/python/python-3.7.7-r2.ebuild b/dev-lang/python/python-3.7.7-r2.ebuild index b0231f6d75..812a8a668d 100644 --- a/dev-lang/python/python-3.7.7-r2.ebuild +++ b/dev-lang/python/python-3.7.7-r2.ebuild @@ -4,7 +4,7 @@ EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs MY_P="Python-${PV}" PYVER=$(ver_cut 1-2) @@ -143,6 +143,7 @@ src_configure() { use ssl || export PYTHON_DISABLE_SSL="1" use tk || disable+=" _tkinter" use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + [[ ${CHOST} == *-darwin* ]] && disable+=" _scproxy" # header issue export PYTHON_DISABLE_MODULES="${disable}" if ! use xml; then @@ -310,7 +311,7 @@ src_install() { -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" # Fix collisions between different slots of Python. - rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + rm -f "${ED}/usr/$(get_libdir)/libpython3$(get_libname)" || die # Cheap hack to get version with ABIFLAGS local abiver=$(cd "${ED}/usr/include"; echo python*) diff --git a/dev-lang/python/python-3.8.3.ebuild b/dev-lang/python/python-3.8.3.ebuild index aeaf91dca5..e17a0b7faa 100644 --- a/dev-lang/python/python-3.8.3.ebuild +++ b/dev-lang/python/python-3.8.3.ebuild @@ -4,7 +4,7 @@ EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs MY_P="Python-${PV}" PYVER=$(ver_cut 1-2) @@ -123,6 +123,7 @@ src_configure() { use ssl || export PYTHON_DISABLE_SSL="1" use tk || disable+=" _tkinter" use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + [[ ${CHOST} == *-darwin* ]] && disable+=" _scproxy" # header issue export PYTHON_DISABLE_MODULES="${disable}" if ! use xml; then @@ -289,7 +290,7 @@ src_install() { -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" # Fix collisions between different slots of Python. - rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + rm -f "${ED}/usr/$(get_libdir)/libpython3$(get_libname)" || die # Cheap hack to get version with ABIFLAGS local abiver=$(cd "${ED}/usr/include"; echo python*) |