diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-03-17 04:02:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-03-19 19:48:08 +0100 |
| commit | 9e65605e27d269b03863059f3fdd794182e7b96c (patch) | |
| tree | b0bc19b13a41e6ec43956d6c4708db294e318473 /package/python2/patches/patch-setup_py | |
| parent | f62b422e5a2b7bb834e061267c48f5db7b069c0e (diff) | |
python2: update to 2.7.13, simplify patches
Diffstat (limited to 'package/python2/patches/patch-setup_py')
| -rw-r--r-- | package/python2/patches/patch-setup_py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py index 065bf642b..bf8e90c9d 100644 --- a/package/python2/patches/patch-setup_py +++ b/package/python2/patches/patch-setup_py @@ -1,5 +1,5 @@ ---- Python-2.7.9.orig/setup.py 2014-12-10 17:00:01.000000000 +0100 -+++ Python-2.7.9/setup.py 2015-04-11 08:37:49.609444500 +0200 +--- Python-2.7.13.orig/setup.py 2016-12-17 21:05:07.000000000 +0100 ++++ Python-2.7.13/setup.py 2017-03-16 19:45:12.000000000 +0100 @@ -74,7 +74,7 @@ def find_file(filename, std_dirs, paths) 'paths' is a list of additional locations to check; if the file is found in one of them, the resulting list will contain the directory. @@ -42,10 +42,10 @@ - if host_platform == 'darwin' and is_macosx_sdk_path(p): + if host_platform == 'darwin' and is_macosx_sdk_path(p) and not cross_compiling: - if os.path.join(sysroot, p[1:]) == dirname: - return [ ] - -@@ -129,7 +129,7 @@ def find_library_file(compiler, libname, + # Note that, as of Xcode 7, Apple SDKs may contain textual stub + # libraries with .tbd extensions rather than the normal .dylib + # shared libraries installed in /. The Apple compiler tool +@@ -145,7 +145,7 @@ def find_library_file(compiler, libname, # Ensure path doesn't end with path separator p = p.rstrip(os.sep) @@ -54,7 +54,7 @@ if os.path.join(sysroot, p[1:]) == dirname: return [ p ] -@@ -162,6 +162,7 @@ class PyBuildExt(build_ext): +@@ -178,6 +178,7 @@ class PyBuildExt(build_ext): def build_extensions(self): @@ -62,7 +62,7 @@ # Detect which modules should be compiled missing = self.detect_modules() -@@ -283,6 +284,7 @@ class PyBuildExt(build_ext): +@@ -299,6 +300,7 @@ class PyBuildExt(build_ext): def build_extension(self, ext): @@ -70,7 +70,7 @@ if ext.name == '_ctypes': if not self.configure_ctypes(ext): return -@@ -444,7 +446,8 @@ class PyBuildExt(build_ext): +@@ -460,7 +462,8 @@ class PyBuildExt(build_ext): add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') if cross_compiling: self.add_gcc_paths() @@ -80,7 +80,7 @@ # Add paths specified in the environment variables LDFLAGS and # CPPFLAGS for header and library files. -@@ -481,7 +484,8 @@ class PyBuildExt(build_ext): +@@ -497,7 +500,8 @@ class PyBuildExt(build_ext): add_dir_to_list(dir_list, directory) if os.path.normpath(sys.prefix) != '/usr' \ @@ -90,7 +90,7 @@ # 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 -@@ -499,8 +503,13 @@ class PyBuildExt(build_ext): +@@ -515,8 +519,13 @@ class PyBuildExt(build_ext): # 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. @@ -104,7 +104,7 @@ if not cross_compiling: for d in ( '/usr/include', -@@ -534,7 +543,7 @@ class PyBuildExt(build_ext): +@@ -550,7 +559,7 @@ class PyBuildExt(build_ext): if host_platform == 'hp-ux11': lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] |