diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-11-08 10:34:46 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2010-11-14 21:08:26 -0800 |
commit | 793bb465b3a6b0c883340621575b9944d7ccaf5a (patch) | |
tree | b668cfadf3836b3d018dd76005f3bb65b4f8dd03 /meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch | |
parent | a7af5c516e547e669d92569dba21a9c1c790cf7f (diff) | |
download | poky-793bb465b3a6b0c883340621575b9944d7ccaf5a.tar.gz |
python, python-native upgrade from 2.6.5 to 2.6.6
Removed these patch:
python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch
python/00-fix-bindir-libdir-for-cross.patch
The upstream code has changed, and it does not need the above 2 patches
(fixes) anymore.
Patches rebased to the newer code:
python/01-use-proper-tools-for-cross-build.patch
python/04-default-is-optimized.patch
python/06-avoid_usr_lib_termcap_path_in_linking.patch
python/99-ignore-optimization-flag.patch
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch b/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch index 30aa50dd44..68c9d5cfd5 100644 --- a/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch +++ b/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch | |||
@@ -7,14 +7,14 @@ This Patch fixes this issue in the python build environment. | |||
7 | 11 Oct 2010 | 7 | 11 Oct 2010 |
8 | Nitin A Kamble <nitin.a.kamble@intel.com> | 8 | Nitin A Kamble <nitin.a.kamble@intel.com> |
9 | 9 | ||
10 | Index: Python-2.6.5/setup.py | 10 | Index: Python-2.6.6/setup.py |
11 | =================================================================== | 11 | =================================================================== |
12 | --- Python-2.6.5.orig/setup.py | 12 | --- Python-2.6.6.orig/setup.py |
13 | +++ Python-2.6.5/setup.py | 13 | +++ Python-2.6.6/setup.py |
14 | @@ -591,12 +591,10 @@ class PyBuildExt(build_ext): | 14 | @@ -665,12 +665,10 @@ class PyBuildExt(build_ext): |
15 | readline_libs.append('ncurses') | 15 | pass # Issue 7384: Already linked against curses or tinfo. |
16 | elif self.compiler.find_library_file(lib_dirs, 'curses'): | 16 | elif curses_library: |
17 | readline_libs.append('curses') | 17 | readline_libs.append(curses_library) |
18 | - elif self.compiler.find_library_file(lib_dirs + | 18 | - elif self.compiler.find_library_file(lib_dirs + |
19 | - ['/usr/lib/termcap'], | 19 | - ['/usr/lib/termcap'], |
20 | + elif self.compiler.find_library_file(lib_dirs, | 20 | + elif self.compiler.find_library_file(lib_dirs, |