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-native/nohostlibs.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-native/nohostlibs.patch')
-rw-r--r-- | meta/recipes-devtools/python/python-native/nohostlibs.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-native/nohostlibs.patch b/meta/recipes-devtools/python/python-native/nohostlibs.patch new file mode 100644 index 0000000000..da2bd8f1d2 --- /dev/null +++ b/meta/recipes-devtools/python/python-native/nohostlibs.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | Index: Python-2.6.6/setup.py | ||
2 | =================================================================== | ||
3 | --- Python-2.6.6.orig/setup.py | ||
4 | +++ Python-2.6.6/setup.py | ||
5 | @@ -356,8 +356,8 @@ class PyBuildExt(build_ext): | ||
6 | |||
7 | def detect_modules(self): | ||
8 | # Ensure that /usr/local is always used | ||
9 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | ||
10 | - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | ||
11 | + #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | ||
12 | + #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | ||
13 | |||
14 | # Add paths specified in the environment variables LDFLAGS and | ||
15 | # CPPFLAGS for header and library files. | ||
16 | @@ -393,10 +393,10 @@ class PyBuildExt(build_ext): | ||
17 | for directory in reversed(options.dirs): | ||
18 | add_dir_to_list(dir_list, directory) | ||
19 | |||
20 | - if os.path.normpath(sys.prefix) != '/usr': | ||
21 | - add_dir_to_list(self.compiler.library_dirs, | ||
22 | + | ||
23 | + add_dir_to_list(self.compiler.library_dirs, | ||
24 | sysconfig.get_config_var("LIBDIR")) | ||
25 | - add_dir_to_list(self.compiler.include_dirs, | ||
26 | + add_dir_to_list(self.compiler.include_dirs, | ||
27 | sysconfig.get_config_var("INCLUDEDIR")) | ||
28 | |||
29 | try: | ||
30 | @@ -407,11 +407,8 @@ class PyBuildExt(build_ext): | ||
31 | # lib_dirs and inc_dirs are used to search for files; | ||
32 | # if a file is found in one of those directories, it can | ||
33 | # be assumed that no additional -I,-L directives are needed. | ||
34 | - lib_dirs = self.compiler.library_dirs + [ | ||
35 | - '/lib64', '/usr/lib64', | ||
36 | - '/lib', '/usr/lib', | ||
37 | - ] | ||
38 | - inc_dirs = self.compiler.include_dirs + ['/usr/include'] | ||
39 | + lib_dirs = self.compiler.library_dirs | ||
40 | + inc_dirs = self.compiler.include_dirs | ||
41 | exts = [] | ||
42 | missing = [] | ||
43 | |||
44 | @@ -661,8 +658,7 @@ class PyBuildExt(build_ext): | ||
45 | pass # Issue 7384: Already linked against curses or tinfo. | ||
46 | elif curses_library: | ||
47 | readline_libs.append(curses_library) | ||
48 | - elif self.compiler.find_library_file(lib_dirs + | ||
49 | - ['/usr/lib/termcap'], | ||
50 | + elif self.compiler.find_library_file(lib_dirs, | ||
51 | 'termcap'): | ||
52 | readline_libs.append('termcap') | ||
53 | exts.append( Extension('readline', ['readline.c'], | ||