| Upstream-Status: Inappropriate [embedded specific] |
| |
| 2014/12/15 |
| Rebased for python-2.7.9 |
| Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> |
| Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> |
| |
| Index: Python-2.7.9/setup.py |
| =================================================================== |
| --- Python-2.7.9.orig/setup.py |
| +++ Python-2.7.9/setup.py |
| @@ -439,9 +439,9 @@ class PyBuildExt(build_ext): |
| |
| def detect_modules(self): |
| # Ensure that /usr/local is always used |
| - if not cross_compiling: |
| - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
| - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
| + # if not cross_compiling: |
| + # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
| + # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
| if cross_compiling: |
| self.add_gcc_paths() |
| self.add_multiarch_paths() |
| @@ -480,15 +480,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' \ |
| - 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, |
| + add_dir_to_list(self.compiler.include_dirs, |
| sysconfig.get_config_var("INCLUDEDIR")) |
| |
| try: |
| @@ -761,8 +761,7 @@ 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'], |
| + elif self.compiler.find_library_file(lib_dirs, |
| 'termcap'): |
| readline_libs.append('termcap') |
| exts.append( Extension('readline', ['readline.c'], |