blob: 078060b49e5febdad42c8e4db5f1411dd93447c9 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001Upstream-Status: Inappropriate [embedded specific]
2
32014/12/15
4Rebased for python-2.7.9
Patrick Williamsc0f7c042017-02-23 20:41:17 -06005Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
6Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Patrick Williamsc124f4f2015-09-15 14:41:29 -05007
8Index: Python-2.7.9/setup.py
9===================================================================
10--- Python-2.7.9.orig/setup.py
11+++ Python-2.7.9/setup.py
12@@ -439,9 +439,9 @@ class PyBuildExt(build_ext):
13
14 def detect_modules(self):
15 # Ensure that /usr/local is always used
16- if not cross_compiling:
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+ # if not cross_compiling:
20+ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
21+ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
22 if cross_compiling:
23 self.add_gcc_paths()
24 self.add_multiarch_paths()
25@@ -480,15 +480,15 @@ class PyBuildExt(build_ext):
26 for directory in reversed(options.dirs):
27 add_dir_to_list(dir_list, directory)
28
29- if os.path.normpath(sys.prefix) != '/usr' \
30- and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
31+ #if os.path.normpath(sys.prefix) != '/usr' \
32+ #and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
33 # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
34 # (PYTHONFRAMEWORK is set) to avoid # linking problems when
35 # building a framework with different architectures than
36 # the one that is currently installed (issue #7473)
37- add_dir_to_list(self.compiler.library_dirs,
38+ add_dir_to_list(self.compiler.library_dirs,
39 sysconfig.get_config_var("LIBDIR"))
40- add_dir_to_list(self.compiler.include_dirs,
41+ add_dir_to_list(self.compiler.include_dirs,
42 sysconfig.get_config_var("INCLUDEDIR"))
43
44 try:
45@@ -761,8 +761,7 @@ class PyBuildExt(build_ext):
46 pass # Issue 7384: Already linked against curses or tinfo.
47 elif curses_library:
48 readline_libs.append(curses_library)
49- elif self.compiler.find_library_file(lib_dirs +
50- ['/usr/lib/termcap'],
51+ elif self.compiler.find_library_file(lib_dirs,
52 'termcap'):
53 readline_libs.append('termcap')
54 exts.append( Extension('readline', ['readline.c'],