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-native/nohostlibs.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-native/nohostlibs.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python-native/nohostlibs.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/meta/recipes-devtools/python/python-native/nohostlibs.patch b/meta/recipes-devtools/python/python-native/nohostlibs.patch deleted file mode 100644 index 078060b49e..0000000000 --- a/meta/recipes-devtools/python/python-native/nohostlibs.patch +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | 2014/12/15 | ||
| 4 | Rebased for python-2.7.9 | ||
| 5 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
| 6 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
| 7 | |||
| 8 | Index: Python-2.7.9/setup.py | ||
| 9 | =================================================================== | ||
| 10 | --- Python-2.7.9.orig/setup.py | ||
| 11 | +++ Python-2.7.9/setup.py | ||
| 12 | @@ -439,9 +439,9 @@ class PyBuildExt(build_ext): | ||
| 13 | |||
| 14 | def detect_modules(self): | ||
| 15 | # Ensure that /usr/local is always used | ||
| 16 | - if not cross_compiling: | ||
| 17 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | ||
| 18 | - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | ||
| 19 | + # if not cross_compiling: | ||
| 20 | + # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | ||
| 21 | + # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | ||
| 22 | if cross_compiling: | ||
| 23 | self.add_gcc_paths() | ||
| 24 | self.add_multiarch_paths() | ||
| 25 | @@ -480,15 +480,15 @@ class PyBuildExt(build_ext): | ||
| 26 | for directory in reversed(options.dirs): | ||
| 27 | add_dir_to_list(dir_list, directory) | ||
| 28 | |||
| 29 | - if os.path.normpath(sys.prefix) != '/usr' \ | ||
| 30 | - and not sysconfig.get_config_var('PYTHONFRAMEWORK'): | ||
| 31 | + #if os.path.normpath(sys.prefix) != '/usr' \ | ||
| 32 | + #and not sysconfig.get_config_var('PYTHONFRAMEWORK'): | ||
| 33 | # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework | ||
| 34 | # (PYTHONFRAMEWORK is set) to avoid # linking problems when | ||
| 35 | # building a framework with different architectures than | ||
| 36 | # the one that is currently installed (issue #7473) | ||
| 37 | - add_dir_to_list(self.compiler.library_dirs, | ||
| 38 | + add_dir_to_list(self.compiler.library_dirs, | ||
| 39 | sysconfig.get_config_var("LIBDIR")) | ||
| 40 | - add_dir_to_list(self.compiler.include_dirs, | ||
| 41 | + add_dir_to_list(self.compiler.include_dirs, | ||
| 42 | sysconfig.get_config_var("INCLUDEDIR")) | ||
| 43 | |||
| 44 | try: | ||
| 45 | @@ -761,8 +761,7 @@ class PyBuildExt(build_ext): | ||
| 46 | pass # Issue 7384: Already linked against curses or tinfo. | ||
| 47 | elif curses_library: | ||
| 48 | readline_libs.append(curses_library) | ||
| 49 | - elif self.compiler.find_library_file(lib_dirs + | ||
| 50 | - ['/usr/lib/termcap'], | ||
| 51 | + elif self.compiler.find_library_file(lib_dirs, | ||
| 52 | 'termcap'): | ||
| 53 | readline_libs.append('termcap') | ||
| 54 | exts.append( Extension('readline', ['readline.c'], | ||
