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/search_db_h_in_inc_dirs_and_avoid_warning.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/search_db_h_in_inc_dirs_and_avoid_warning.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch b/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch deleted file mode 100644 index dacb552ec7..0000000000 --- a/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | python should search for db.h in inc_dirs and not in a hardcoded path. | ||
2 | If db.h is found but HASHVERSION is not 2 we avoid a warning by not | ||
3 | adding this module to missing variable. | ||
4 | |||
5 | Upstream-Status: Inappropriate [distribution] | ||
6 | |||
7 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
8 | |||
9 | |||
10 | diff --git a/setup.py b/setup.py | ||
11 | index b887808..ae51607 100644 | ||
12 | --- a/setup.py | ||
13 | +++ b/setup.py | ||
14 | @@ -1237,6 +1237,8 @@ class PyBuildExt(build_ext): | ||
15 | # the more recent berkeleydb's db.h file first in the include path | ||
16 | # when attempting to compile and it will fail. | ||
17 | f = "/usr/include/db.h" | ||
18 | + if len(inc_dirs) != 0: | ||
19 | + f = os.path.join(inc_dirs[0], "db.h") | ||
20 | |||
21 | if host_platform == 'darwin': | ||
22 | if is_macosx_sdk_path(f): | ||
23 | @@ -1257,8 +1259,10 @@ class PyBuildExt(build_ext): | ||
24 | libraries=libraries)) | ||
25 | else: | ||
26 | exts.append(Extension('bsddb185', ['bsddbmodule.c'])) | ||
27 | - else: | ||
28 | - missing.append('bsddb185') | ||
29 | + # If a newer version is detected don't report an useless | ||
30 | + # warning | ||
31 | + #else: | ||
32 | + # missing.append('bsddb185') | ||
33 | else: | ||
34 | missing.append('bsddb185') | ||
35 | |||