diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2015-02-11 17:57:49 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-23 17:35:29 +0000 |
commit | cb02ecb507ddad3cb17c78020b42c004aa2903ae (patch) | |
tree | 0f30353b3c8a3aaf6294f8db9c8fb7cff5575ab9 /meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch | |
parent | 122ee11bd1817f776336e54898cb36162fe527df (diff) | |
download | poky-cb02ecb507ddad3cb17c78020b42c004aa2903ae.tar.gz |
Python: Upgrade from 2.7.3 to 2.7.9:
- Based on Paul Eggletons work to partially upgrade to Python 2.7.6
Modified:
default-versions.inc: switched to python 2.7.9
generate-manifest-2.7.py: fixed _sysconfigdata
python-2.7-manifest.inc: fixed _sysconfigdata
python.inc: Updated checksums and source, no LICENSE
change just updated some dates
python-native_2.7.3 -> python-native_2.7.9 and updated patches
python_2.7.3 -> python_2.7.9, and added ac_cv_file__dev_ptmx=no
ac_cv_file__dev_ptc=no in EXTRA_OECONF to solve python
issue #3754, only needed when cross compiling, also updated patches
use_sysroot_ncurses_instead_of_host.patch: New patch to use ncursesw
from sysroot instead of hosts, introduced by fix for python issue #15268
Rebased:
01-use-proper-tools-for-cross-build.patch
03-fix-tkinter-detection.patch
05-enable-ctypes-cross-build.patch
06-avoid_usr_lib_termcap_path_in_linking.patch
avoid_warning_about_tkinter.patch
builddir.patch
fix_for_using_different_libdir.patch
host_include_contamination.patch
multilib.patch
nohostlibs.patch
search_db_h_in_inc_dirs_and_avoid_warning.patch
Deleted (fixed on upstream):
06-ctypes-libffi-fix-configure.patch
CVE-2013-4073_py27.patch
gcc-4.8-fix-configure-Wformat.patch
json-flaw-fix.patch
posix_close.patch
pypirc-secure.patch
python-2.7.3-CVE-2012-2135.patch
python-2.7.3-CVE-2013-1752-smtplib-fix.patch
python-2.7.3-CVE-2014-1912.patch
python-2.7.3-CVE-2014-7185.patch
python-2.7.3-berkeley-db-5.3.patch
python-fix-build-error-with-Readline-6.3.patch
remove-BOM-insection-code.patch
remove_sqlite_rpath.patch
python2.7.3-nossl3.patch
[YOCTO #7059]
(From OE-Core rev: d4ad95f0d5f08891637c644e85b09da9c4585059)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.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 | 23 |
1 files changed, 9 insertions, 14 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 index 0c1f1741cb..dacb552ec7 100644 --- 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 | |||
@@ -6,26 +6,21 @@ Upstream-Status: Inappropriate [distribution] | |||
6 | 6 | ||
7 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | 7 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
8 | 8 | ||
9 | Index: Python-2.7.2/setup.py | 9 | |
10 | =================================================================== | 10 | diff --git a/setup.py b/setup.py |
11 | --- Python-2.7.2.orig/setup.py 2012-04-05 22:27:22.437199989 +0300 | 11 | index b887808..ae51607 100644 |
12 | +++ Python-2.7.2/setup.py 2012-04-05 22:26:38.000000000 +0300 | 12 | --- a/setup.py |
13 | @@ -1141,12 +1141,12 @@ | 13 | +++ b/setup.py |
14 | @@ -1237,6 +1237,8 @@ class PyBuildExt(build_ext): | ||
14 | # the more recent berkeleydb's db.h file first in the include path | 15 | # the more recent berkeleydb's db.h file first in the include path |
15 | # when attempting to compile and it will fail. | 16 | # when attempting to compile and it will fail. |
16 | f = "/usr/include/db.h" | 17 | f = "/usr/include/db.h" |
17 | - | ||
18 | + if len(inc_dirs) != 0: | 18 | + if len(inc_dirs) != 0: |
19 | + f = os.path.join(inc_dirs[0], "db.h") | 19 | + f = os.path.join(inc_dirs[0], "db.h") |
20 | if sys.platform == 'darwin': | 20 | |
21 | if host_platform == 'darwin': | ||
21 | if is_macosx_sdk_path(f): | 22 | if is_macosx_sdk_path(f): |
22 | sysroot = macosx_sdk_root() | 23 | @@ -1257,8 +1259,10 @@ class PyBuildExt(build_ext): |
23 | f = os.path.join(sysroot, f[1:]) | ||
24 | - | ||
25 | if os.path.exists(f) and not db_incs: | ||
26 | data = open(f).read() | ||
27 | m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) | ||
28 | @@ -1161,8 +1161,10 @@ | ||
29 | libraries=libraries)) | 24 | libraries=libraries)) |
30 | else: | 25 | else: |
31 | exts.append(Extension('bsddb185', ['bsddbmodule.c'])) | 26 | exts.append(Extension('bsddb185', ['bsddbmodule.c'])) |