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-native/nohostlibs.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-native/nohostlibs.patch')
-rw-r--r-- | meta/recipes-devtools/python/python-native/nohostlibs.patch | 49 |
1 files changed, 18 insertions, 31 deletions
diff --git a/meta/recipes-devtools/python/python-native/nohostlibs.patch b/meta/recipes-devtools/python/python-native/nohostlibs.patch index 09c3fb808a..8a452e94dc 100644 --- a/meta/recipes-devtools/python/python-native/nohostlibs.patch +++ b/meta/recipes-devtools/python/python-native/nohostlibs.patch | |||
@@ -1,25 +1,28 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | 1 | Upstream-Status: Inappropriate [embedded specific] |
2 | 2 | ||
3 | 2011/09/29 | 3 | 2014/12/15 |
4 | rebased for python-2.7.2 | 4 | Rebased for python-2.7.9 |
5 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | 5 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> |
6 | Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
6 | 7 | ||
7 | Index: Python-2.7.2/setup.py | 8 | Index: Python-2.7.9/setup.py |
8 | =================================================================== | 9 | =================================================================== |
9 | --- Python-2.7.2.orig/setup.py | 10 | --- Python-2.7.9.orig/setup.py |
10 | +++ Python-2.7.2/setup.py | 11 | +++ Python-2.7.9/setup.py |
11 | @@ -369,8 +369,8 @@ class PyBuildExt(build_ext): | 12 | @@ -439,9 +439,9 @@ class PyBuildExt(build_ext): |
12 | 13 | ||
13 | def detect_modules(self): | 14 | def detect_modules(self): |
14 | # Ensure that /usr/local is always used | 15 | # Ensure that /usr/local is always used |
15 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | 16 | - if not cross_compiling: |
16 | - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | 17 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
17 | + #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | 18 | - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
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() | ||
19 | self.add_multiarch_paths() | 24 | self.add_multiarch_paths() |
20 | 25 | @@ -480,15 +480,15 @@ class PyBuildExt(build_ext): | |
21 | # Add paths specified in the environment variables LDFLAGS and | ||
22 | @@ -407,15 +407,15 @@ class PyBuildExt(build_ext): | ||
23 | for directory in reversed(options.dirs): | 26 | for directory in reversed(options.dirs): |
24 | add_dir_to_list(dir_list, directory) | 27 | add_dir_to_list(dir_list, directory) |
25 | 28 | ||
@@ -39,29 +42,13 @@ Index: Python-2.7.2/setup.py | |||
39 | sysconfig.get_config_var("INCLUDEDIR")) | 42 | sysconfig.get_config_var("INCLUDEDIR")) |
40 | 43 | ||
41 | try: | 44 | try: |
42 | @@ -426,11 +426,8 @@ class PyBuildExt(build_ext): | 45 | @@ -761,8 +761,7 @@ class PyBuildExt(build_ext): |
43 | # lib_dirs and inc_dirs are used to search for files; | ||
44 | # if a file is found in one of those directories, it can | ||
45 | # be assumed that no additional -I,-L directives are needed. | ||
46 | - lib_dirs = self.compiler.library_dirs + [ | ||
47 | - '/lib64', '/usr/lib64', | ||
48 | - '/lib', '/usr/lib', | ||
49 | - ] | ||
50 | - inc_dirs = self.compiler.include_dirs + ['/usr/include'] | ||
51 | + lib_dirs = self.compiler.library_dirs | ||
52 | + inc_dirs = self.compiler.include_dirs | ||
53 | exts = [] | ||
54 | missing = [] | ||
55 | |||
56 | @@ -676,9 +673,8 @@ class PyBuildExt(build_ext): | ||
57 | pass # Issue 7384: Already linked against curses or tinfo. | 46 | pass # Issue 7384: Already linked against curses or tinfo. |
58 | elif curses_library: | 47 | elif curses_library: |
59 | readline_libs.append(curses_library) | 48 | readline_libs.append(curses_library) |
60 | - elif self.compiler.find_library_file(lib_dirs + | 49 | - elif self.compiler.find_library_file(lib_dirs + |
61 | - ['/usr/lib/termcap'], | 50 | - ['/usr/lib/termcap'], |
62 | - 'termcap'): | ||
63 | + elif self.compiler.find_library_file(lib_dirs, | 51 | + elif self.compiler.find_library_file(lib_dirs, |
64 | + 'termcap'): | 52 | 'termcap'): |
65 | readline_libs.append('termcap') | 53 | readline_libs.append('termcap') |
66 | exts.append( Extension('readline', ['readline.c'], | 54 | exts.append( Extension('readline', ['readline.c'], |
67 | library_dirs=['/usr/lib/termcap'], | ||