summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-12-29 11:12:11 +0100
committerMichał Górny <mgorny@gentoo.org>2019-12-29 11:12:29 +0100
commitb9d0b2d76c6f490774e10724f630edb9d1d98ecf (patch)
treebd329296037486822740db3991997c9f21f19f24 /dev-lang/python/python-2.7.17-r1.ebuild
parentdev-lang/python: Redo patchset for 2.7.17-r1 (diff)
downloadgentoo-b9d0b2d76c6f490774e10724f630edb9d1d98ecf.tar.gz
gentoo-b9d0b2d76c6f490774e10724f630edb9d1d98ecf.tar.bz2
gentoo-b9d0b2d76c6f490774e10724f630edb9d1d98ecf.zip
dev-lang/python: Revert "Redo patchset for 2.7.17-r1"
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-lang/python/python-2.7.17-r1.ebuild')
-rw-r--r--dev-lang/python/python-2.7.17-r1.ebuild11
1 files changed, 8 insertions, 3 deletions
diff --git a/dev-lang/python/python-2.7.17-r1.ebuild b/dev-lang/python/python-2.7.17-r1.ebuild
index cadc834964dd..424cdec1208e 100644
--- a/dev-lang/python/python-2.7.17-r1.ebuild
+++ b/dev-lang/python/python-2.7.17-r1.ebuild
@@ -8,12 +8,12 @@ inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
MY_P="Python-${PV}"
PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-2.7.17-r1"
+PATCHSET_VERSION="2.7.17"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="https://www.python.org/"
SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
- https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+ https://dev.gentoo.org/~mgorny/dist/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
@@ -86,7 +86,12 @@ src_prepare() {
rm -fr Modules/zlib || die
local PATCHES=(
- "${WORKDIR}/${PATCHSET}"
+ "${WORKDIR}/patches"
+ # Fix for cross-compiling.
+ "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
+ "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
+ "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
+ "${FILESDIR}/python-2.7.10-system-libffi.patch"
)
default