From 01103b2f299fd9aa05ecae40760c2011f235f710 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 14 Oct 2011 07:06:13 +0000 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- .../python/python-native/nohostlibs.patch | 36 ++++++++++++++-------- 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'meta/recipes-devtools/python/python-native/nohostlibs.patch') 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 @@ Upstream-Status: Inappropriate [embedded specific] -Index: Python-2.6.6/setup.py +2011/09/29 +rebased for python-2.7.2 +Signed-Off-By: Nitin A Kamble + +Index: Python-2.7.2/setup.py =================================================================== ---- Python-2.6.6.orig/setup.py -+++ Python-2.6.6/setup.py -@@ -356,8 +356,8 @@ class PyBuildExt(build_ext): +--- Python-2.7.2.orig/setup.py ++++ Python-2.7.2/setup.py +@@ -369,8 +369,8 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used @@ -12,16 +16,22 @@ Index: Python-2.6.6/setup.py - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + self.add_multiarch_paths() # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -393,10 +393,10 @@ class PyBuildExt(build_ext): +@@ -407,15 +407,15 @@ class PyBuildExt(build_ext): for directory in reversed(options.dirs): add_dir_to_list(dir_list, directory) -- if os.path.normpath(sys.prefix) != '/usr': +- if os.path.normpath(sys.prefix) != '/usr' \ +- and not sysconfig.get_config_var('PYTHONFRAMEWORK'): ++ #if os.path.normpath(sys.prefix) != '/usr' \ ++ #and not sysconfig.get_config_var('PYTHONFRAMEWORK'): + # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework + # (PYTHONFRAMEWORK is set) to avoid # linking problems when + # building a framework with different architectures than + # the one that is currently installed (issue #7473) - add_dir_to_list(self.compiler.library_dirs, -+ + add_dir_to_list(self.compiler.library_dirs, sysconfig.get_config_var("LIBDIR")) - add_dir_to_list(self.compiler.include_dirs, @@ -29,7 +39,7 @@ Index: Python-2.6.6/setup.py sysconfig.get_config_var("INCLUDEDIR")) try: -@@ -407,11 +407,8 @@ class PyBuildExt(build_ext): +@@ -426,11 +426,8 @@ class PyBuildExt(build_ext): # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. @@ -43,13 +53,15 @@ Index: Python-2.6.6/setup.py exts = [] missing = [] -@@ -661,8 +658,7 @@ class PyBuildExt(build_ext): +@@ -676,9 +673,8 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], +- ['/usr/lib/termcap'], +- 'termcap'): + elif self.compiler.find_library_file(lib_dirs, - 'termcap'): ++ 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], + library_dirs=['/usr/lib/termcap'], -- cgit v1.2.3-54-g00ecf