Update python to 2.6.1.
[openwrt/svn-archive/archive.git] / lang / python / patches / 030-fixup-include-dirs.patch
1 diff --git a/setup.py b/setup.py
2 index 32e1af8..f7f190f 100644
3 --- a/setup.py
4 +++ b/setup.py
5 @@ -309,9 +309,6 @@ class PyBuildExt(build_ext):
6 return sys.platform
7
8 def detect_modules(self):
9 - # Ensure that /usr/local is always used
10 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
11 - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
12
13 # Add paths specified in the environment variables LDFLAGS and
14 # CPPFLAGS for header and library files.
15 @@ -347,11 +344,6 @@ class PyBuildExt(build_ext):
16 for directory in reversed(options.dirs):
17 add_dir_to_list(dir_list, directory)
18
19 - if os.path.normpath(sys.prefix) != '/usr':
20 - add_dir_to_list(self.compiler.library_dirs,
21 - sysconfig.get_config_var("LIBDIR"))
22 - add_dir_to_list(self.compiler.include_dirs,
23 - sysconfig.get_config_var("INCLUDEDIR"))
24
25 try:
26 have_unicode = unicode
27 @@ -361,11 +353,8 @@ class PyBuildExt(build_ext):
28 # lib_dirs and inc_dirs are used to search for files;
29 # if a file is found in one of those directories, it can
30 # be assumed that no additional -I,-L directives are needed.
31 - lib_dirs = self.compiler.library_dirs + [
32 - '/lib64', '/usr/lib64',
33 - '/lib', '/usr/lib',
34 - ]
35 - inc_dirs = self.compiler.include_dirs + ['/usr/include']
36 + lib_dirs = self.compiler.library_dirs
37 + inc_dirs = self.compiler.include_dirs
38 exts = []
39 missing = []
40