123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384 |
- diff -Nur Python-3.2.2.orig/setup.py Python-3.2.2/setup.py
- --- Python-3.2.2.orig/setup.py 2011-09-03 18:16:50.000000000 +0200
- +++ Python-3.2.2/setup.py 2011-09-05 12:17:57.000000000 +0200
- @@ -332,36 +332,6 @@
- # cached. Clear that cache before trying to import.
- sys.path_importer_cache.clear()
-
- - try:
- - imp.load_dynamic(ext.name, ext_filename)
- - except ImportError as why:
- - self.failed.append(ext.name)
- - self.announce('*** WARNING: renaming "%s" since importing it'
- - ' failed: %s' % (ext.name, why), level=3)
- - assert not self.inplace
- - basename, tail = os.path.splitext(ext_filename)
- - newname = basename + "_failed" + tail
- - if os.path.exists(newname):
- - os.remove(newname)
- - os.rename(ext_filename, newname)
- -
- -
- -
- -
- -
- -
- -
- - try:
- - for filename in self._built_objects:
- - os.remove(filename)
- - except AttributeError:
- - self.announce('unable to remove files (ignored)')
- - except:
- - exc_type, why, tb = sys.exc_info()
- - self.announce('*** WARNING: importing extension "%s" '
- - 'failed with %s: %s' % (ext.name, exc_type, why),
- - level=3)
- - self.failed.append(ext.name)
-
- def get_platform(self):
- # Get value of sys.platform
- @@ -396,8 +366,8 @@
- # Ensure that /usr/local is always used, but the local build
- # directories (i.e. '.' and 'Include') must be first. See issue
- # 10520.
- - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
- - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- + #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
- @@ -434,25 +404,16 @@
- 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'):
- -
- -
- -
- -
- - 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"))
- -
- # 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
- + #+ [
- + # '/lib64', '/usr/lib64',
- + # '/lib', '/usr/lib',
- + # ]
- + inc_dirs = self.compiler.include_dirs
- + #+ ['/usr/include']
- exts = []
- missing = []
-
|