code.vuplus.com Git - vuplus_openembedded/blob - recipes/python/python-2.6.7/nohostlibs.patch

   1 Index: Python-2.6.6/setup.py
   2 ===================================================================
   3 --- Python-2.6.6.orig/setup.py
   4 +++ Python-2.6.6/setup.py
   5 @@ -356,8 +356,8 @@ class PyBuildExt(build_ext):
   6
   7      def detect_modules(self):
   8          # Ensure that /usr/local is always used
   9 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
  10 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  11 +        #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
  12 +        #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  13
  14          # Add paths specified in the environment variables LDFLAGS and
  15          # CPPFLAGS for header and library files.
  16 @@ -393,10 +393,10 @@ class PyBuildExt(build_ext):
  17                      for directory in reversed(options.dirs):
  18                          add_dir_to_list(dir_list, directory)
  19
  20 -        if os.path.normpath(sys.prefix) != '/usr':
  21 -            add_dir_to_list(self.compiler.library_dirs,
  22 +
  23 +        add_dir_to_list(self.compiler.library_dirs,
  24                              sysconfig.get_config_var("LIBDIR"))
  25 -            add_dir_to_list(self.compiler.include_dirs,
  26 +        add_dir_to_list(self.compiler.include_dirs,
  27                              sysconfig.get_config_var("INCLUDEDIR"))
  28
  29          try:
  30 @@ -407,11 +407,8 @@ class PyBuildExt(build_ext):
  31          # lib_dirs and inc_dirs are used to search for files;
  32          # if a file is found in one of those directories, it can
  33          # be assumed that no additional -I,-L directives are needed.
  34 -        lib_dirs = self.compiler.library_dirs + [
  35 -            '/lib64', '/usr/lib64',
  36 -            '/lib', '/usr/lib',
  37 -            ]
  38 -        inc_dirs = self.compiler.include_dirs + ['/usr/include']
  39 +        lib_dirs = self.compiler.library_dirs
  40 +        inc_dirs = self.compiler.include_dirs
  41          exts = []
  42          missing = []
  43
  44 @@ -661,8 +658,7 @@ class PyBuildExt(build_ext):
  45                  pass # Issue 7384: Already linked against curses or tinfo.
  46              elif curses_library:
  47                  readline_libs.append(curses_library)
  48 -            elif self.compiler.find_library_file(lib_dirs +
  49 -                                               ['/usr/lib/termcap'],
  50 +            elif self.compiler.find_library_file(lib_dirs,
  51                                                 'termcap'):
  52                  readline_libs.append('termcap')
  53              exts.append( Extension('readline', ['readline.c'],
  54 -                                   library_dirs=['/usr/lib/termcap'],
  55                                     extra_link_args=readline_extra_link_args,
  56                                     libraries=readline_libs) )
  57          else: