lang/python/patches/030-fixup-include-dirs.patch

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