diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-10-14 07:06:13 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-31 22:03:20 +0000 |
| commit | 01103b2f299fd9aa05ecae40760c2011f235f710 (patch) | |
| tree | 43ebed3560003af61dccfefeb2d3da4932ad7167 /meta/recipes-devtools/python/python-native/nohostlibs.patch | |
| parent | 0d18f03b225ffaffb1e17b40ff909f4948880647 (diff) | |
| download | poky-01103b2f299fd9aa05ecae40760c2011f235f710.tar.gz | |
python, python-native: upgrade from 2.6.6 to 2.7.2
Rebased these patches to the newer code
modified: python-native/nohostlibs.patch
modified: python/01-use-proper-tools-for-cross-build.patch
modified: python/06-avoid_usr_lib_termcap_path_in_linking.patch
modified: python/06-ctypes-libffi-fix-configure.patch
modified: python/multilib.patch
Deleted these patches are the are now upstream
deleted: python/02-remove-test-for-cross.patch
deleted: python/security_issue_2254_fix.patch
Added this patch to python-native
new file: python-native/multilib.patch
Updated site config file for python
modified: ../../site/common-linux : add ac_cv_have_long_long_format for python
avoid this error in python:
Include/pyport.h:243:13: error: #error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG"
Updated default python version
modified: ../../conf/distro/include/default-versions.inc
(From OE-Core rev: b284e9a512860b8a8380be80f96cebce6b92ff80)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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 | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/meta/recipes-devtools/python/python-native/nohostlibs.patch b/meta/recipes-devtools/python/python-native/nohostlibs.patch index aed45c9913..09c3fb808a 100644 --- a/meta/recipes-devtools/python/python-native/nohostlibs.patch +++ b/meta/recipes-devtools/python/python-native/nohostlibs.patch | |||
| @@ -1,10 +1,14 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | 1 | Upstream-Status: Inappropriate [embedded specific] |
| 2 | 2 | ||
| 3 | Index: Python-2.6.6/setup.py | 3 | 2011/09/29 |
| 4 | rebased for python-2.7.2 | ||
| 5 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
| 6 | |||
| 7 | Index: Python-2.7.2/setup.py | ||
| 4 | =================================================================== | 8 | =================================================================== |
| 5 | --- Python-2.6.6.orig/setup.py | 9 | --- Python-2.7.2.orig/setup.py |
| 6 | +++ Python-2.6.6/setup.py | 10 | +++ Python-2.7.2/setup.py |
| 7 | @@ -356,8 +356,8 @@ class PyBuildExt(build_ext): | 11 | @@ -369,8 +369,8 @@ class PyBuildExt(build_ext): |
| 8 | 12 | ||
| 9 | def detect_modules(self): | 13 | def detect_modules(self): |
| 10 | # Ensure that /usr/local is always used | 14 | # Ensure that /usr/local is always used |
| @@ -12,16 +16,22 @@ Index: Python-2.6.6/setup.py | |||
| 12 | - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | 16 | - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
| 13 | + #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | 17 | + #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
| 14 | + #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | 18 | + #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
| 19 | self.add_multiarch_paths() | ||
| 15 | 20 | ||
| 16 | # Add paths specified in the environment variables LDFLAGS and | 21 | # Add paths specified in the environment variables LDFLAGS and |
| 17 | # CPPFLAGS for header and library files. | 22 | @@ -407,15 +407,15 @@ class PyBuildExt(build_ext): |
| 18 | @@ -393,10 +393,10 @@ class PyBuildExt(build_ext): | ||
| 19 | for directory in reversed(options.dirs): | 23 | for directory in reversed(options.dirs): |
| 20 | add_dir_to_list(dir_list, directory) | 24 | add_dir_to_list(dir_list, directory) |
| 21 | 25 | ||
| 22 | - if os.path.normpath(sys.prefix) != '/usr': | 26 | - if os.path.normpath(sys.prefix) != '/usr' \ |
| 27 | - and not sysconfig.get_config_var('PYTHONFRAMEWORK'): | ||
| 28 | + #if os.path.normpath(sys.prefix) != '/usr' \ | ||
| 29 | + #and not sysconfig.get_config_var('PYTHONFRAMEWORK'): | ||
| 30 | # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework | ||
| 31 | # (PYTHONFRAMEWORK is set) to avoid # linking problems when | ||
| 32 | # building a framework with different architectures than | ||
| 33 | # the one that is currently installed (issue #7473) | ||
| 23 | - add_dir_to_list(self.compiler.library_dirs, | 34 | - add_dir_to_list(self.compiler.library_dirs, |
| 24 | + | ||
| 25 | + add_dir_to_list(self.compiler.library_dirs, | 35 | + add_dir_to_list(self.compiler.library_dirs, |
| 26 | sysconfig.get_config_var("LIBDIR")) | 36 | sysconfig.get_config_var("LIBDIR")) |
| 27 | - add_dir_to_list(self.compiler.include_dirs, | 37 | - add_dir_to_list(self.compiler.include_dirs, |
| @@ -29,7 +39,7 @@ Index: Python-2.6.6/setup.py | |||
| 29 | sysconfig.get_config_var("INCLUDEDIR")) | 39 | sysconfig.get_config_var("INCLUDEDIR")) |
| 30 | 40 | ||
| 31 | try: | 41 | try: |
| 32 | @@ -407,11 +407,8 @@ class PyBuildExt(build_ext): | 42 | @@ -426,11 +426,8 @@ class PyBuildExt(build_ext): |
| 33 | # lib_dirs and inc_dirs are used to search for files; | 43 | # lib_dirs and inc_dirs are used to search for files; |
| 34 | # if a file is found in one of those directories, it can | 44 | # if a file is found in one of those directories, it can |
| 35 | # be assumed that no additional -I,-L directives are needed. | 45 | # be assumed that no additional -I,-L directives are needed. |
| @@ -43,13 +53,15 @@ Index: Python-2.6.6/setup.py | |||
| 43 | exts = [] | 53 | exts = [] |
| 44 | missing = [] | 54 | missing = [] |
| 45 | 55 | ||
| 46 | @@ -661,8 +658,7 @@ class PyBuildExt(build_ext): | 56 | @@ -676,9 +673,8 @@ class PyBuildExt(build_ext): |
| 47 | pass # Issue 7384: Already linked against curses or tinfo. | 57 | pass # Issue 7384: Already linked against curses or tinfo. |
| 48 | elif curses_library: | 58 | elif curses_library: |
| 49 | readline_libs.append(curses_library) | 59 | readline_libs.append(curses_library) |
| 50 | - elif self.compiler.find_library_file(lib_dirs + | 60 | - elif self.compiler.find_library_file(lib_dirs + |
| 51 | - ['/usr/lib/termcap'], | 61 | - ['/usr/lib/termcap'], |
| 62 | - 'termcap'): | ||
| 52 | + elif self.compiler.find_library_file(lib_dirs, | 63 | + elif self.compiler.find_library_file(lib_dirs, |
| 53 | 'termcap'): | 64 | + 'termcap'): |
| 54 | readline_libs.append('termcap') | 65 | readline_libs.append('termcap') |
| 55 | exts.append( Extension('readline', ['readline.c'], | 66 | exts.append( Extension('readline', ['readline.c'], |
| 67 | library_dirs=['/usr/lib/termcap'], | ||
