Без опису

030-fixup-include-dirs.patch 2.1KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. ---
  2. setup.py | 15 ++-------------
  3. 1 file changed, 2 insertions(+), 13 deletions(-)
  4. --- a/setup.py
  5. +++ b/setup.py
  6. @@ -368,11 +368,6 @@ class PyBuildExt(build_ext):
  7. os.unlink(tmpfile)
  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. - self.add_multiarch_paths()
  13. -
  14. # Add paths specified in the environment variables LDFLAGS and
  15. # CPPFLAGS for header and library files.
  16. # We must get the values from the Makefile and not the environment
  17. @@ -407,17 +402,6 @@ class PyBuildExt(build_ext):
  18. for directory in reversed(options.dirs):
  19. add_dir_to_list(dir_list, directory)
  20. - if os.path.normpath(sys.prefix) != '/usr' \
  21. - and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
  22. - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
  23. - # (PYTHONFRAMEWORK is set) to avoid # linking problems when
  24. - # building a framework with different architectures than
  25. - # the one that is currently installed (issue #7473)
  26. - add_dir_to_list(self.compiler.library_dirs,
  27. - sysconfig.get_config_var("LIBDIR"))
  28. - add_dir_to_list(self.compiler.include_dirs,
  29. - sysconfig.get_config_var("INCLUDEDIR"))
  30. -
  31. try:
  32. have_unicode = unicode
  33. except NameError:
  34. @@ -426,11 +410,8 @@ class PyBuildExt(build_ext):
  35. # lib_dirs and inc_dirs are used to search for files;
  36. # if a file is found in one of those directories, it can
  37. # be assumed that no additional -I,-L directives are needed.
  38. - lib_dirs = self.compiler.library_dirs + [
  39. - '/lib64', '/usr/lib64',
  40. - '/lib', '/usr/lib',
  41. - ]
  42. - inc_dirs = self.compiler.include_dirs + ['/usr/include']
  43. + lib_dirs = self.compiler.library_dirs
  44. + inc_dirs = self.compiler.include_dirs
  45. exts = []
  46. missing = []