From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C0651382C5 for ; Fri, 11 Dec 2020 14:31:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCFEAE0930; Fri, 11 Dec 2020 14:31:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B214CE0930 for ; Fri, 11 Dec 2020 14:31:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4471D340EF3 for ; Fri, 11 Dec 2020 14:31:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C757939F for ; Fri, 11 Dec 2020 14:31:20 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1607697039.b46e01ab3f567a11aecf7cfaefe0133a8179e0f5.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: dev-lang/python/Manifest dev-lang/python/python-3.8.6.ebuild X-VCS-Directories: dev-lang/python/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: b46e01ab3f567a11aecf7cfaefe0133a8179e0f5 X-VCS-Branch: master Date: Fri, 11 Dec 2020 14:31:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cef96bee-bb11-425f-ae95-62243f8737de X-Archives-Hash: 1a25e01584f816ea50420a32dcff3f0b commit: b46e01ab3f567a11aecf7cfaefe0133a8179e0f5 Author: Fabian Groffen gentoo org> AuthorDate: Fri Dec 11 14:30:39 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Dec 11 14:30:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b46e01ab dev-lang/python-3.8.6: fix build on Darwin - fix patchset to enable correct building bits for cursesmodule - move Framework to usable location, also used by compiler and linker Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> dev-lang/python/Manifest | 2 +- dev-lang/python/python-3.8.6.ebuild | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 790642a69d..7633fd720d 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -9,6 +9,6 @@ DIST python-gentoo-patches-3.8.6.tar.xz 10956 BLAKE2B e3241d97f886d0a37f85735102 DIST python-prefix-2.7.16-gentoo-patches-r0.tar.xz 14636 BLAKE2B 54320f5197bb7adeca1e7c97447253e6535a11f380b6d66bc2ce46fa671fe23697aced8fd5619633a00e3ea19ae9dbc3ffe2981173d83dcab6b447d514555c43 SHA512 5380d9b92eb81603ec4d60ff9c940a3a061c06bd6f593d5837e600da5d4417b529d20d98d758aa95cef18fac10bdb5c33f90fa943deb15fdaf048492cf286581 DIST python-prefix-gentoo-3.7.8-patches-r0.tar.xz 13068 BLAKE2B 32e8baf8a0d5bdcb973ba880dbc35a3bd5c6cba88bf2f647e18fc4839fe8bae94658e403e050bcecc5dd5ddadf5beaf8a489829bc2835589d77b968628c29233 SHA512 1a7c17424edc43b36867d45ac019f48734444328bf17b5eddd07a2b63ef26e74147dea83e1286a9e45372acc85640a8d72fed33cbe551170acd785fe12b43d74 DIST python-prefix-gentoo-3.8.5-patches-r0.tar.xz 8948 BLAKE2B e2da338a00a239355e9d4c79bd46c78b54671017120ff79497a9a95a8e3c3096870a8667667f633de6216e83b574c8e65a8e7bfafd51c84595dca6fe9ccb78ed SHA512 8ae712782a255da8bf451b063e86e92c34a32bccce8ac00d76c0a4b0087cee8ea085f80827b49ec61fea18dc4924d4780c6d2f577c8f5d982d6482dde6e02091 -DIST python-prefix-gentoo-3.8.6-patches-r0.tar.xz 7688 BLAKE2B ea18ea2b5fc35a06d1f98b81fc9709dad271c6e9eefbeebdfe5acc712cec309e256ae27ab8ae5fbbda35c580e101f2e2979b81b8a9eca5b9f40c22cbe3fcee05 SHA512 7dd4c59da47a53c9ee7a6af42a16761ad71a8b7f977f8bdf93db4af2bedc337de8bea597e9dad05a2a5f440963c2b56b4b77352a0bf7bb6f1136550e5c9c5df0 +DIST python-prefix-gentoo-3.8.6-patches-r2.tar.xz 8132 BLAKE2B 07b2fed42257a89612c2f402e1adadaef171d483f7f28b85a5a9548713406ad97267a5df6ce39f0e363f76850266292d4b7c43854ef6067e09758d8939411131 SHA512 505f4ade99e4c5ca3f6bef84bc1c97e7197d5b5d6ed4229823df1d142ce00241a7f0f0c336bd01065e4834919dc162ec6797d5272a3c753e0507663eb9b6a94c DIST python2-cygwinports-7be648659ef46f33db6913ca0ca5a809219d5629.zip 9199 BLAKE2B 85803bc1677bd16650cb5fc4a2c54fdac0228326f25cfba4fcd098ac9d689312d3e0dde6fca57f720d5235361d6462461cf018325c23fda9139e0f1683055aff SHA512 cabc21d2d7379daf1f4bafe7ab00b70e5b4f707d3102496b96ff0dfdced26347097ad771c69e0b9488b7c54b1ef36f9bc019bee72f1ffcbb55dcd0e71095edfe DIST python37-cygwinports-6df749d21f131eeafa485d40eb1294b28d30ba6a.tar.gz 8102 BLAKE2B 7331142fc9c2fd71e5ec5ae45d6aaebe8e39430b5719d01a673966a5ba10b344bba924d6f7f05cc444cedbf28b11cef2db1c2613ebf45fcceb90354895b9b42c SHA512 da669c3a518af73c4caa7c9cc35af2fd971f98e7ba9b91ae0223b2f031e74acc70644fb2411ad5a8d4b39e2c449b5c256bea4877d957030cb81c0d08e84b38dd diff --git a/dev-lang/python/python-3.8.6.ebuild b/dev-lang/python/python-3.8.6.ebuild index 2ee3d275cd..6c73eff420 100644 --- a/dev-lang/python/python-3.8.6.ebuild +++ b/dev-lang/python/python-3.8.6.ebuild @@ -10,7 +10,7 @@ inherit autotools flag-o-matic multiprocessing pax-utils \ MY_P="Python-${PV}" PYVER=$(ver_cut 1-2) PATCHSET="python-gentoo-patches-${PV}" -PREFIX_PATCHSET="python-prefix-gentoo-${PV}-patches-r0" +PREFIX_PATCHSET="python-prefix-gentoo-${PV}-patches-r2" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE="https://www.python.org/" @@ -75,10 +75,6 @@ src_prepare() { default - # we provide a fully working readline also on Darwin, so don't force - # usage of less functional libedit - sed -i -e 's/__APPLE__/__NO_MUCKING_AROUND__/g' Modules/readline.c || die - # We may have wrapped /usr/ccs/bin/nm on AIX for long TMPDIR. sed -i -e "/^NM=.*nm$/s,^.*$,NM=$(tc-getNM)," Modules/makexp_aix || die @@ -91,14 +87,6 @@ src_prepare() { sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die - # workaround a development build env problem and muck around - # framework install to get the best of both worlds (non-standard) - sed -i \ - -e "s:FRAMEWORKINSTALLAPPSPREFIX=\":FRAMEWORKINSTALLAPPSPREFIX=\"${EPREFIX}:" \ - -e '/RUNSHARED=DYLD_FRAMEWORK_PATH/s/FRAMEWORK/LIBRARY/g' \ - configure.ac configure || die - sed -i -e '/find/s/$/ || true/' Mac/PythonLauncher/Makefile.in || die - # workaround a problem on ppc-macos with >=GCC-8 where dtoa gets # miscompiled when optimisation is being used if [[ ${CHOST} == powerpc*-darwin* ]] && \ @@ -110,7 +98,7 @@ src_prepare() { # Darwin 9's kqueue seems to act up (at least at this stage), so # make Python's selectors resort to poll() or select() - if [[ ${CHOST} == powerpc*-darwin* ]] ; then + if [[ ${CHOST} == powerpc*-darwin9 ]] ; then sed -i \ -e 's/KQUEUE/KQUEUE_DISABLED/' \ configure.ac configure || die @@ -121,6 +109,9 @@ src_prepare() { sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \ Lib/urllib/request.py || die + # disable SDK usage on Darwin/macOS + sed -i -e '/^MACOS = /s/darwin/no-darwin/' setup.py || die + eautoreconf } @@ -186,7 +177,7 @@ src_configure() { if use aqua ; then ECONF_SOURCE="${S}" OPT="" \ econf \ - --enable-framework="${EPREFIX}"/usr/lib \ + --enable-framework="${EPREFIX}" \ --config-cache fi @@ -285,7 +276,7 @@ src_install() { rmdir "${ED}"/Applications/Python* || die rmdir "${ED}"/Applications || die - local fwdir=/usr/$(get_libdir)/Python.framework/Versions/${PYVER} + local fwdir=/Frameworks/Python.framework/Versions/${PYVER} ln -s "${EPREFIX}"/usr/include/python${PYVER} \ "${ED}${fwdir}"/Headers || die ln -s "${EPREFIX}"/usr/lib/libpython${PYVER}.dylib \