From dd5a3c0c80ac35b30b61296507bf5d3bd3a609d2 Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Wed, 29 Mar 2017 08:45:05 +0200 Subject: python/python-native: upgrade from 2.7.11 to 2.7.12 Rebases: - default-versions.inc - multilib.patch - 01-use-proper-tools-for-cross-build.patch - debug.patch - python.inc Upstream: - avoid_parallel_make_races_on_pgen.patch - CVE-2016-5636.patch (Backported from OE-Core rev: adf4266524d0d1a7814d31496c3ecc6470644ec6) Signed-off-by: Sona Sarmadi Signed-off-by: Adrian Dudau --- .../recipes-devtools/python/python-native/debug.patch | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'meta/recipes-devtools/python/python-native/debug.patch') diff --git a/meta/recipes-devtools/python/python-native/debug.patch b/meta/recipes-devtools/python/python-native/debug.patch index 5ec10d6b20..c2b20e0a6e 100644 --- a/meta/recipes-devtools/python/python-native/debug.patch +++ b/meta/recipes-devtools/python/python-native/debug.patch @@ -1,24 +1,29 @@ Upstream-Status: Pending -Index: Python-2.6.1/Lib/distutils/unixccompiler.py +Rebased for python-2.7.12 +Signed-off-by: Sona Sarmadi +Index: Python-2.7.12/Lib/distutils/unixccompiler.py =================================================================== ---- Python-2.6.1.orig/Lib/distutils/unixccompiler.py 2009-11-13 16:04:54.000000000 +0000 -+++ Python-2.6.1/Lib/distutils/unixccompiler.py 2009-11-13 16:06:27.000000000 +0000 -@@ -300,6 +300,8 @@ - dylib_f = self.library_filename(lib, lib_type='dylib') - static_f = self.library_filename(lib, lib_type='static') +--- Python-2.7.12.orig/Lib/distutils/unixccompiler.py ++++ Python-2.7.12/Lib/distutils/unixccompiler.py +@@ -278,6 +278,8 @@ class UnixCCompiler(CCompiler): + + + print "Looking in %s for %s" % (lib, dirs) + for dir in dirs: shared = os.path.join(dir, shared_f) dylib = os.path.join(dir, dylib_f) -@@ -309,10 +311,13 @@ +@@ -298,12 +300,16 @@ class UnixCCompiler(CCompiler): # assuming that *all* Unix C compilers do. And of course I'm # ignoring even GCC's "-static" option. So sue me. if os.path.exists(dylib): + print "Found %s" % (dylib) return dylib + elif os.path.exists(xcode_stub): ++ print "Found %s" % (xcode_stub) + return xcode_stub elif os.path.exists(shared): + print "Found %s" % (shared) return shared -- cgit v1.2.3-54-g00ecf