summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python-native/nohostlibs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/python/python-native/nohostlibs.patch')
-rw-r--r--meta/recipes-devtools/python/python-native/nohostlibs.patch49
1 files changed, 18 insertions, 31 deletions
diff --git a/meta/recipes-devtools/python/python-native/nohostlibs.patch b/meta/recipes-devtools/python/python-native/nohostlibs.patch
index 09c3fb808a..8a452e94dc 100644
--- a/meta/recipes-devtools/python/python-native/nohostlibs.patch
+++ b/meta/recipes-devtools/python/python-native/nohostlibs.patch
@@ -1,25 +1,28 @@
1Upstream-Status: Inappropriate [embedded specific] 1Upstream-Status: Inappropriate [embedded specific]
2 2
32011/09/29 32014/12/15
4rebased for python-2.7.2 4Rebased for python-2.7.9
5Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 5Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
6Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
6 7
7Index: Python-2.7.2/setup.py 8Index: Python-2.7.9/setup.py
8=================================================================== 9===================================================================
9--- Python-2.7.2.orig/setup.py 10--- Python-2.7.9.orig/setup.py
10+++ Python-2.7.2/setup.py 11+++ Python-2.7.9/setup.py
11@@ -369,8 +369,8 @@ class PyBuildExt(build_ext): 12@@ -439,9 +439,9 @@ class PyBuildExt(build_ext):
12 13
13 def detect_modules(self): 14 def detect_modules(self):
14 # Ensure that /usr/local is always used 15 # Ensure that /usr/local is always used
15- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 16- if not cross_compiling:
16- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 17- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
17+ #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 18- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
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()
19 self.add_multiarch_paths() 24 self.add_multiarch_paths()
20 25@@ -480,15 +480,15 @@ class PyBuildExt(build_ext):
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): 26 for directory in reversed(options.dirs):
24 add_dir_to_list(dir_list, directory) 27 add_dir_to_list(dir_list, directory)
25 28
@@ -39,29 +42,13 @@ Index: Python-2.7.2/setup.py
39 sysconfig.get_config_var("INCLUDEDIR")) 42 sysconfig.get_config_var("INCLUDEDIR"))
40 43
41 try: 44 try:
42@@ -426,11 +426,8 @@ class PyBuildExt(build_ext): 45@@ -761,8 +761,7 @@ 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. 46 pass # Issue 7384: Already linked against curses or tinfo.
58 elif curses_library: 47 elif curses_library:
59 readline_libs.append(curses_library) 48 readline_libs.append(curses_library)
60- elif self.compiler.find_library_file(lib_dirs + 49- elif self.compiler.find_library_file(lib_dirs +
61- ['/usr/lib/termcap'], 50- ['/usr/lib/termcap'],
62- 'termcap'):
63+ elif self.compiler.find_library_file(lib_dirs, 51+ elif self.compiler.find_library_file(lib_dirs,
64+ 'termcap'): 52 'termcap'):
65 readline_libs.append('termcap') 53 readline_libs.append('termcap')
66 exts.append( Extension('readline', ['readline.c'], 54 exts.append( Extension('readline', ['readline.c'],
67 library_dirs=['/usr/lib/termcap'],