diff options
Diffstat (limited to 'meta/recipes-devtools/python/python-native/nohostlibs.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python-native/nohostlibs.patch | 67 |
1 files changed, 67 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..09c3fb808a --- /dev/null +++ b/meta/recipes-devtools/python/python-native/nohostlibs.patch | |||
| @@ -0,0 +1,67 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | |||
| 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 | ||
| 8 | =================================================================== | ||
| 9 | --- Python-2.7.2.orig/setup.py | ||
| 10 | +++ Python-2.7.2/setup.py | ||
| 11 | @@ -369,8 +369,8 @@ class PyBuildExt(build_ext): | ||
| 12 | |||
| 13 | def detect_modules(self): | ||
| 14 | # Ensure that /usr/local is always used | ||
| 15 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | ||
| 16 | - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | ||
| 17 | + #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | ||
| 18 | + #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | ||
| 19 | self.add_multiarch_paths() | ||
| 20 | |||
| 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): | ||
| 24 | add_dir_to_list(dir_list, directory) | ||
| 25 | |||
| 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) | ||
| 34 | - add_dir_to_list(self.compiler.library_dirs, | ||
| 35 | + add_dir_to_list(self.compiler.library_dirs, | ||
| 36 | sysconfig.get_config_var("LIBDIR")) | ||
| 37 | - add_dir_to_list(self.compiler.include_dirs, | ||
| 38 | + add_dir_to_list(self.compiler.include_dirs, | ||
| 39 | sysconfig.get_config_var("INCLUDEDIR")) | ||
| 40 | |||
| 41 | try: | ||
| 42 | @@ -426,11 +426,8 @@ 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. | ||
| 58 | elif curses_library: | ||
| 59 | readline_libs.append(curses_library) | ||
| 60 | - elif self.compiler.find_library_file(lib_dirs + | ||
| 61 | - ['/usr/lib/termcap'], | ||
| 62 | - 'termcap'): | ||
| 63 | + elif self.compiler.find_library_file(lib_dirs, | ||
| 64 | + 'termcap'): | ||
| 65 | readline_libs.append('termcap') | ||
| 66 | exts.append( Extension('readline', ['readline.c'], | ||
| 67 | library_dirs=['/usr/lib/termcap'], | ||