diff options
Diffstat (limited to 'package/python/patches/patch-setup_py')
| -rw-r--r-- | package/python/patches/patch-setup_py | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/package/python/patches/patch-setup_py b/package/python/patches/patch-setup_py index c9f3dfe08..2c910039c 100644 --- a/package/python/patches/patch-setup_py +++ b/package/python/patches/patch-setup_py @@ -1,6 +1,7 @@ ---- Python-3.1.1.orig/setup.py 2009-08-12 20:39:44.000000000 +0200 -+++ Python-3.1.1/setup.py 2009-09-28 19:12:33.550271196 +0200 -@@ -255,36 +255,6 @@ class PyBuildExt(build_ext): +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() @@ -37,32 +38,32 @@ def get_platform(self): # Get value of sys.platform -@@ -295,8 +265,8 @@ class PyBuildExt(build_ext): - - def detect_modules(self): - # Ensure that /usr/local is always used +@@ -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 - # CPPFLAGS for header and library files. -@@ -332,20 +302,22 @@ class PyBuildExt(build_ext): +@@ -434,25 +404,16 @@ for directory in reversed(options.dirs): add_dir_to_list(dir_list, directory) -- if os.path.normpath(sys.prefix) != '/usr': +- 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")) -+ #if os.path.normpath(sys.prefix) != '/usr': -+ # 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. @@ -71,13 +72,13 @@ - '/lib', '/usr/lib', - ] - inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ #lib_dirs = self.compiler.library_dirs + [ ++ lib_dirs = self.compiler.library_dirs ++ #+ [ + # '/lib64', '/usr/lib64', + # '/lib', '/usr/lib', + # ] -+ #inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ inc_dirs = self.compiler.include_dirs -+ lib_dirs = self.compiler.library_dirs ++ inc_dirs = self.compiler.include_dirs ++ #+ ['/usr/include'] exts = [] missing = [] |