diff options
author | Ross Burton <ross.burton@intel.com> | 2020-01-17 14:16:32 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-19 13:24:38 +0000 |
commit | 2ed5d927ca9b88d3964ada990ef46cdd38ec4b1e (patch) | |
tree | 2110d3e9381867553c69ae5c743887e1caa97926 /meta/recipes-devtools/python/python/host_include_contamination.patch | |
parent | 2b5cf2a067cb6d9ca32d851dacdc1aff0cbfe904 (diff) | |
download | poky-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/host_include_contamination.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/host_include_contamination.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-devtools/python/python/host_include_contamination.patch b/meta/recipes-devtools/python/python/host_include_contamination.patch deleted file mode 100644 index e0aafb218b..0000000000 --- a/meta/recipes-devtools/python/python/host_include_contamination.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | when building python for qemux86-64 on ubuntu 11.10/64bit | ||
2 | it gropes into host includes and then mixes them with cross | ||
3 | includes and as a result some modules fail to compile and link | ||
4 | one of the modules is python-elementtree which is then not | ||
5 | found during image creation | ||
6 | |||
7 | Proble is that setup.py tries to add native includes that newer | ||
8 | ubuntu has introduced for multiarch support. But that should | ||
9 | only happen for native builds and not cross building python | ||
10 | so we add a check here. | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | Upstream-Status: Pending | ||
14 | |||
15 | |||
16 | diff --git a/setup.py b/setup.py | ||
17 | index ba2d242..bf859be 100644 | ||
18 | --- a/setup.py | ||
19 | +++ b/setup.py | ||
20 | @@ -393,6 +393,8 @@ class PyBuildExt(build_ext): | ||
21 | |||
22 | if not find_executable('dpkg-architecture'): | ||
23 | return | ||
24 | + if os.environ.get('CROSS_COMPILE') is not None: | ||
25 | + return | ||
26 | opt = '' | ||
27 | if cross_compiling: | ||
28 | opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE') | ||