1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 |
-
- setup.py | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-
-
- @@ -368,11 +368,6 @@ class PyBuildExt(build_ext):
- os.unlink(tmpfile)
-
- def detect_modules(self):
- - # Ensure that /usr/local is always used
- - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
- - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- - self.add_multiarch_paths()
- -
- # Add paths specified in the environment variables LDFLAGS and
- # CPPFLAGS for header and library files.
- # We must get the values from the Makefile and not the environment
- @@ -407,17 +402,6 @@ 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'):
- - # 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,
- - sysconfig.get_config_var("LIBDIR"))
- - add_dir_to_list(self.compiler.include_dirs,
- - sysconfig.get_config_var("INCLUDEDIR"))
- -
- try:
- have_unicode = unicode
- except NameError:
- @@ -426,11 +410,8 @@ class PyBuildExt(build_ext):
- # lib_dirs and inc_dirs are used to search for files;
- # if a file is found in one of those directories, it can
- # be assumed that no additional -I,-L directives are needed.
- - lib_dirs = self.compiler.library_dirs + [
- - '/lib64', '/usr/lib64',
- - '/lib', '/usr/lib',
- - ]
- - inc_dirs = self.compiler.include_dirs + ['/usr/include']
- + lib_dirs = self.compiler.library_dirs
- + inc_dirs = self.compiler.include_dirs
- exts = []
- missing = []
-
|