summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-01-17 14:16:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-19 13:24:38 +0000
commit2ed5d927ca9b88d3964ada990ef46cdd38ec4b1e (patch)
tree2110d3e9381867553c69ae5c743887e1caa97926 /meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
parent2b5cf2a067cb6d9ca32d851dacdc1aff0cbfe904 (diff)
downloadpoky-2ed5d927ca9b88d3964ada990ef46cdd38ec4b1e.tar.gz
python: remove Python 2 and all supporting classes
Python 2 ceased being maintained on the 1st January 2020. We've already removed all users of it from oe-core so the final step is to move the recipe and supporting classes to meta-python2. The following are removed in this commit: - python and python-native 2.7.17 - python-setuptools - The classes pythonnative, pythondir, distutils, setuptools (From OE-Core rev: 390f3edabfb1f68ed9766245291c5f44ea00cc38) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch')
-rw-r--r--meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
deleted file mode 100644
index b02c09458f..0000000000
--- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1We need to ensure our host tools get run during build, not the freshly
2built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN.
3
4Upstream-Status: Inappropriate [embedded specific]
5
6Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille-media.de>
7Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
8
9Rebased for python-2.7.9
10Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
11
12Rebased for python-2.7.14
13Signed-off-by: Derek Straka <derek@asterius.io>
14
15Index: Python-2.7.13/Makefile.pre.in
16===================================================================
17--- Python-2.7.13.orig/Makefile.pre.in
18+++ Python-2.7.13/Makefile.pre.in
19@@ -512,7 +513,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA
20 $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
21
22 platform: $(BUILDPYTHON) pybuilddir.txt
23- $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
24+ $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
25
26 # Create build directory and generate the sysconfig build-time data there.
27 # pybuilddir.txt contains the name of the build dir and is used for
28Index: Python-2.7.13/setup.py
29===================================================================
30--- Python-2.7.13.orig/setup.py
31+++ Python-2.7.13/setup.py
32@@ -350,6 +350,7 @@ class PyBuildExt(build_ext):
33 self.failed.append(ext.name)
34 self.announce('*** WARNING: renaming "%s" since importing it'
35 ' failed: %s' % (ext.name, why), level=3)
36+ return
37 assert not self.inplace
38 basename, tail = os.path.splitext(ext_filename)
39 newname = basename + "_failed" + tail
40@@ -574,6 +575,9 @@ class PyBuildExt(build_ext):
41
42 # XXX Omitted modules: gl, pure, dl, SGI-specific modules
43
44+ lib_dirs = [ os.getenv("STAGING_LIBDIR"), os.getenv("STAGING_BASELIBDIR") ]
45+ inc_dirs = [ os.getenv("STAGING_INCDIR") ]
46+
47 #
48 # The following modules are all pretty straightforward, and compile
49 # on pretty much any POSIXish platform.