summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-08-03 18:49:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:30 +0100
commitadf4266524d0d1a7814d31496c3ecc6470644ec6 (patch)
tree12f5e4f1dbbdc8ba53bc02012b12848c006efdc2 /meta/recipes-devtools
parentdb9508891b6985d3467ce7a04e12f75a07fa756f (diff)
downloadpoky-adf4266524d0d1a7814d31496c3ecc6470644ec6.tar.gz
python: upgrade from 2.7.11 to 2.7.12
LICENSE did not change, only dates were changed Rebases: - multilib.patch - 01-use-proper-tools-for-cross-build.patch Upstream: - avoid_parallel_make_races_on_pgen.patch - CVE-2016-5636.patch (From OE-Core rev: 2e64fdc99a0e00bd0a4b4bf09a128e56fd8e9f8b) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch40
-rw-r--r--meta/recipes-devtools/python/python/multilib.patch114
-rw-r--r--meta/recipes-devtools/python/python_2.7.12.bb (renamed from meta/recipes-devtools/python/python_2.7.11.bb)2
3 files changed, 77 insertions, 79 deletions
diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
index 4d1395de01..b2a8c3b5a3 100644
--- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
+++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
@@ -9,11 +9,11 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9Rebased for python-2.7.9 9Rebased for python-2.7.9
10Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> 10Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
11 11
12Index: Python-2.7.9/Makefile.pre.in 12Index: Python-2.7.12/Makefile.pre.in
13=================================================================== 13===================================================================
14--- Python-2.7.9.orig/Makefile.pre.in 14--- Python-2.7.12.orig/Makefile.pre.in
15+++ Python-2.7.9/Makefile.pre.in 15+++ Python-2.7.12/Makefile.pre.in
16@@ -234,6 +234,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ 16@@ -246,6 +246,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
17 ########################################################################## 17 ##########################################################################
18 # Parser 18 # Parser
19 PGEN= Parser/pgen$(EXE) 19 PGEN= Parser/pgen$(EXE)
@@ -21,7 +21,7 @@ Index: Python-2.7.9/Makefile.pre.in
21 21
22 PSRCS= \ 22 PSRCS= \
23 Parser/acceler.c \ 23 Parser/acceler.c \
24@@ -445,7 +446,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA 24@@ -513,7 +514,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA
25 $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) 25 $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
26 26
27 platform: $(BUILDPYTHON) pybuilddir.txt 27 platform: $(BUILDPYTHON) pybuilddir.txt
@@ -30,16 +30,16 @@ Index: Python-2.7.9/Makefile.pre.in
30 30
31 # Create build directory and generate the sysconfig build-time data there. 31 # Create build directory and generate the sysconfig build-time data there.
32 # pybuilddir.txt contains the name of the build dir and is used for 32 # pybuilddir.txt contains the name of the build dir and is used for
33@@ -611,7 +612,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p 33@@ -684,7 +685,7 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
34 $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) 34 @$(MKDIR_P) Include
35 @$(MKDIR_P) Include 35 # Avoid copying the file onto itself for an in-tree build
36 $(MAKE) $(PGEN) 36 if test "$(cross_compiling)" != "yes"; then \
37- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 37- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
38+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 38+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
39 $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) 39 else \
40 $(MAKE) $(GRAMMAR_H) 40 cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \
41 touch $(GRAMMAR_C) 41 mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \
42@@ -1043,27 +1044,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL 42@@ -1133,27 +1134,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL
43 $(DESTDIR)$(LIBDEST)/distutils/tests ; \ 43 $(DESTDIR)$(LIBDEST)/distutils/tests ; \
44 fi 44 fi
45 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 45 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -73,11 +73,11 @@ Index: Python-2.7.9/Makefile.pre.in
73 73
74 # Create the PLATDIR source directory, if one wasn't distributed.. 74 # Create the PLATDIR source directory, if one wasn't distributed..
75 $(srcdir)/Lib/$(PLATDIR): 75 $(srcdir)/Lib/$(PLATDIR):
76Index: Python-2.7.9/setup.py 76Index: Python-2.7.12/setup.py
77=================================================================== 77===================================================================
78--- Python-2.7.9.orig/setup.py 78--- Python-2.7.12.orig/setup.py
79+++ Python-2.7.9/setup.py 79+++ Python-2.7.12/setup.py
80@@ -334,6 +334,7 @@ class PyBuildExt(build_ext): 80@@ -350,6 +350,7 @@ class PyBuildExt(build_ext):
81 self.failed.append(ext.name) 81 self.failed.append(ext.name)
82 self.announce('*** WARNING: renaming "%s" since importing it' 82 self.announce('*** WARNING: renaming "%s" since importing it'
83 ' failed: %s' % (ext.name, why), level=3) 83 ' failed: %s' % (ext.name, why), level=3)
@@ -85,7 +85,7 @@ Index: Python-2.7.9/setup.py
85 assert not self.inplace 85 assert not self.inplace
86 basename, tail = os.path.splitext(ext_filename) 86 basename, tail = os.path.splitext(ext_filename)
87 newname = basename + "_failed" + tail 87 newname = basename + "_failed" + tail
88@@ -558,6 +559,9 @@ class PyBuildExt(build_ext): 88@@ -574,6 +575,9 @@ class PyBuildExt(build_ext):
89 89
90 # XXX Omitted modules: gl, pure, dl, SGI-specific modules 90 # XXX Omitted modules: gl, pure, dl, SGI-specific modules
91 91
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch
index 47c4bc1e90..b169133d7d 100644
--- a/meta/recipes-devtools/python/python/multilib.patch
+++ b/meta/recipes-devtools/python/python/multilib.patch
@@ -1,11 +1,11 @@
1Rebased for python-2.7.9 1Rebased for python-2.7.9
2Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> 2Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
3 3
4Index: Python-2.7.9/configure.ac 4Index: Python-2.7.12/configure.ac
5=================================================================== 5===================================================================
6--- Python-2.7.9.orig/configure.ac 6--- Python-2.7.12.orig/configure.ac
7+++ Python-2.7.9/configure.ac 7+++ Python-2.7.12/configure.ac
8@@ -736,6 +736,10 @@ SunOS*) 8@@ -756,6 +756,10 @@ SunOS*)
9 ;; 9 ;;
10 esac 10 esac
11 11
@@ -16,10 +16,10 @@ Index: Python-2.7.9/configure.ac
16 16
17 AC_SUBST(LIBRARY) 17 AC_SUBST(LIBRARY)
18 AC_MSG_CHECKING(LIBRARY) 18 AC_MSG_CHECKING(LIBRARY)
19Index: Python-2.7.9/Include/pythonrun.h 19Index: Python-2.7.12/Include/pythonrun.h
20=================================================================== 20===================================================================
21--- Python-2.7.9.orig/Include/pythonrun.h 21--- Python-2.7.12.orig/Include/pythonrun.h
22+++ Python-2.7.9/Include/pythonrun.h 22+++ Python-2.7.12/Include/pythonrun.h
23@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); 23@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void);
24 /* In their own files */ 24 /* In their own files */
25 PyAPI_FUNC(const char *) Py_GetVersion(void); 25 PyAPI_FUNC(const char *) Py_GetVersion(void);
@@ -28,10 +28,10 @@ Index: Python-2.7.9/Include/pythonrun.h
28 PyAPI_FUNC(const char *) Py_GetCopyright(void); 28 PyAPI_FUNC(const char *) Py_GetCopyright(void);
29 PyAPI_FUNC(const char *) Py_GetCompiler(void); 29 PyAPI_FUNC(const char *) Py_GetCompiler(void);
30 PyAPI_FUNC(const char *) Py_GetBuildInfo(void); 30 PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
31Index: Python-2.7.9/Lib/distutils/command/install.py 31Index: Python-2.7.12/Lib/distutils/command/install.py
32=================================================================== 32===================================================================
33--- Python-2.7.9.orig/Lib/distutils/command/install.py 33--- Python-2.7.12.orig/Lib/distutils/command/install.py
34+++ Python-2.7.9/Lib/distutils/command/install.py 34+++ Python-2.7.12/Lib/distutils/command/install.py
35@@ -22,6 +22,8 @@ from site import USER_BASE 35@@ -22,6 +22,8 @@ from site import USER_BASE
36 from site import USER_SITE 36 from site import USER_SITE
37 37
@@ -50,10 +50,10 @@ Index: Python-2.7.9/Lib/distutils/command/install.py
50 'headers': '$base/include/python$py_version_short/$dist_name', 50 'headers': '$base/include/python$py_version_short/$dist_name',
51 'scripts': '$base/bin', 51 'scripts': '$base/bin',
52 'data' : '$base', 52 'data' : '$base',
53Index: Python-2.7.9/Lib/distutils/sysconfig.py 53Index: Python-2.7.12/Lib/distutils/sysconfig.py
54=================================================================== 54===================================================================
55--- Python-2.7.9.orig/Lib/distutils/sysconfig.py 55--- Python-2.7.12.orig/Lib/distutils/sysconfig.py
56+++ Python-2.7.9/Lib/distutils/sysconfig.py 56+++ Python-2.7.12/Lib/distutils/sysconfig.py
57@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan 57@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan
58 prefix = plat_specific and EXEC_PREFIX or PREFIX 58 prefix = plat_specific and EXEC_PREFIX or PREFIX
59 59
@@ -68,11 +68,11 @@ Index: Python-2.7.9/Lib/distutils/sysconfig.py
68 if standard_lib: 68 if standard_lib:
69 return libpython 69 return libpython
70 else: 70 else:
71Index: Python-2.7.9/Lib/pydoc.py 71Index: Python-2.7.12/Lib/pydoc.py
72=================================================================== 72===================================================================
73--- Python-2.7.9.orig/Lib/pydoc.py 73--- Python-2.7.12.orig/Lib/pydoc.py
74+++ Python-2.7.9/Lib/pydoc.py 74+++ Python-2.7.12/Lib/pydoc.py
75@@ -383,7 +383,7 @@ class Doc: 75@@ -384,7 +384,7 @@ class Doc:
76 76
77 docloc = os.environ.get("PYTHONDOCS", 77 docloc = os.environ.get("PYTHONDOCS",
78 "http://docs.python.org/library") 78 "http://docs.python.org/library")
@@ -81,10 +81,10 @@ Index: Python-2.7.9/Lib/pydoc.py
81 "python"+sys.version[0:3]) 81 "python"+sys.version[0:3])
82 if (isinstance(object, type(os)) and 82 if (isinstance(object, type(os)) and
83 (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', 83 (object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
84Index: Python-2.7.9/Lib/site.py 84Index: Python-2.7.12/Lib/site.py
85=================================================================== 85===================================================================
86--- Python-2.7.9.orig/Lib/site.py 86--- Python-2.7.12.orig/Lib/site.py
87+++ Python-2.7.9/Lib/site.py 87+++ Python-2.7.12/Lib/site.py
88@@ -288,13 +288,18 @@ def getsitepackages(): 88@@ -288,13 +288,18 @@ def getsitepackages():
89 if sys.platform in ('os2emx', 'riscos'): 89 if sys.platform in ('os2emx', 'riscos'):
90 sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) 90 sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
@@ -107,10 +107,10 @@ Index: Python-2.7.9/Lib/site.py
107 if sys.platform == "darwin": 107 if sys.platform == "darwin":
108 # for framework builds *only* we add the standard Apple 108 # for framework builds *only* we add the standard Apple
109 # locations. 109 # locations.
110Index: Python-2.7.9/Lib/sysconfig.py 110Index: Python-2.7.12/Lib/sysconfig.py
111=================================================================== 111===================================================================
112--- Python-2.7.9.orig/Lib/sysconfig.py 112--- Python-2.7.12.orig/Lib/sysconfig.py
113+++ Python-2.7.9/Lib/sysconfig.py 113+++ Python-2.7.12/Lib/sysconfig.py
114@@ -7,10 +7,10 @@ from os.path import pardir, realpath 114@@ -7,10 +7,10 @@ from os.path import pardir, realpath
115 115
116 _INSTALL_SCHEMES = { 116 _INSTALL_SCHEMES = {
@@ -139,10 +139,10 @@ Index: Python-2.7.9/Lib/sysconfig.py
139 'include': '{userbase}/include/python{py_version_short}', 139 'include': '{userbase}/include/python{py_version_short}',
140 'scripts': '{userbase}/bin', 140 'scripts': '{userbase}/bin',
141 'data' : '{userbase}', 141 'data' : '{userbase}',
142Index: Python-2.7.9/Lib/test/test_dl.py 142Index: Python-2.7.12/Lib/test/test_dl.py
143=================================================================== 143===================================================================
144--- Python-2.7.9.orig/Lib/test/test_dl.py 144--- Python-2.7.12.orig/Lib/test/test_dl.py
145+++ Python-2.7.9/Lib/test/test_dl.py 145+++ Python-2.7.12/Lib/test/test_dl.py
146@@ -4,10 +4,11 @@ 146@@ -4,10 +4,11 @@
147 import unittest 147 import unittest
148 from test.test_support import verbose, import_module 148 from test.test_support import verbose, import_module
@@ -157,11 +157,11 @@ Index: Python-2.7.9/Lib/test/test_dl.py
157 ('/usr/bin/cygwin1.dll', 'getpid'), 157 ('/usr/bin/cygwin1.dll', 'getpid'),
158 ('/usr/lib/libc.dylib', 'getpid'), 158 ('/usr/lib/libc.dylib', 'getpid'),
159 ] 159 ]
160Index: Python-2.7.9/Lib/test/test_site.py 160Index: Python-2.7.12/Lib/test/test_site.py
161=================================================================== 161===================================================================
162--- Python-2.7.9.orig/Lib/test/test_site.py 162--- Python-2.7.12.orig/Lib/test/test_site.py
163+++ Python-2.7.9/Lib/test/test_site.py 163+++ Python-2.7.12/Lib/test/test_site.py
164@@ -241,12 +241,16 @@ class HelperFunctionsTests(unittest.Test 164@@ -246,12 +246,16 @@ class HelperFunctionsTests(unittest.Test
165 self.assertEqual(dirs[2], wanted) 165 self.assertEqual(dirs[2], wanted)
166 elif os.sep == '/': 166 elif os.sep == '/':
167 # OS X non-framwework builds, Linux, FreeBSD, etc 167 # OS X non-framwework builds, Linux, FreeBSD, etc
@@ -181,10 +181,10 @@ Index: Python-2.7.9/Lib/test/test_site.py
181 else: 181 else:
182 # other platforms 182 # other platforms
183 self.assertEqual(len(dirs), 2) 183 self.assertEqual(len(dirs), 2)
184Index: Python-2.7.9/Lib/trace.py 184Index: Python-2.7.12/Lib/trace.py
185=================================================================== 185===================================================================
186--- Python-2.7.9.orig/Lib/trace.py 186--- Python-2.7.12.orig/Lib/trace.py
187+++ Python-2.7.9/Lib/trace.py 187+++ Python-2.7.12/Lib/trace.py
188@@ -754,10 +754,10 @@ def main(argv=None): 188@@ -754,10 +754,10 @@ def main(argv=None):
189 # should I also call expanduser? (after all, could use $HOME) 189 # should I also call expanduser? (after all, could use $HOME)
190 190
@@ -198,11 +198,11 @@ Index: Python-2.7.9/Lib/trace.py
198 "python" + sys.version[:3])) 198 "python" + sys.version[:3]))
199 s = os.path.normpath(s) 199 s = os.path.normpath(s)
200 ignore_dirs.append(s) 200 ignore_dirs.append(s)
201Index: Python-2.7.9/Makefile.pre.in 201Index: Python-2.7.12/Makefile.pre.in
202=================================================================== 202===================================================================
203--- Python-2.7.9.orig/Makefile.pre.in 203--- Python-2.7.12.orig/Makefile.pre.in
204+++ Python-2.7.9/Makefile.pre.in 204+++ Python-2.7.12/Makefile.pre.in
205@@ -87,6 +87,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG 205@@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
206 206
207 # Machine-dependent subdirectories 207 # Machine-dependent subdirectories
208 MACHDEP= @MACHDEP@ 208 MACHDEP= @MACHDEP@
@@ -210,7 +210,7 @@ Index: Python-2.7.9/Makefile.pre.in
210 210
211 # Multiarch directory (may be empty) 211 # Multiarch directory (may be empty)
212 MULTIARCH= @MULTIARCH@ 212 MULTIARCH= @MULTIARCH@
213@@ -106,7 +107,7 @@ LIBDIR= @libdir@ 213@@ -111,7 +112,7 @@ LIBDIR= @libdir@
214 MANDIR= @mandir@ 214 MANDIR= @mandir@
215 INCLUDEDIR= @includedir@ 215 INCLUDEDIR= @includedir@
216 CONFINCLUDEDIR= $(exec_prefix)/include 216 CONFINCLUDEDIR= $(exec_prefix)/include
@@ -219,7 +219,7 @@ Index: Python-2.7.9/Makefile.pre.in
219 219
220 # Detailed destination directories 220 # Detailed destination directories
221 BINLIBDEST= $(LIBDIR)/python$(VERSION) 221 BINLIBDEST= $(LIBDIR)/python$(VERSION)
222@@ -598,6 +599,7 @@ Modules/getpath.o: $(srcdir)/Modules/get 222@@ -670,6 +671,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
223 -DEXEC_PREFIX='"$(exec_prefix)"' \ 223 -DEXEC_PREFIX='"$(exec_prefix)"' \
224 -DVERSION='"$(VERSION)"' \ 224 -DVERSION='"$(VERSION)"' \
225 -DVPATH='"$(VPATH)"' \ 225 -DVPATH='"$(VPATH)"' \
@@ -227,7 +227,7 @@ Index: Python-2.7.9/Makefile.pre.in
227 -o $@ $(srcdir)/Modules/getpath.c 227 -o $@ $(srcdir)/Modules/getpath.c
228 228
229 Modules/python.o: $(srcdir)/Modules/python.c 229 Modules/python.o: $(srcdir)/Modules/python.c
230@@ -640,7 +642,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) 230@@ -721,7 +723,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
231 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) 231 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
232 232
233 Python/getplatform.o: $(srcdir)/Python/getplatform.c 233 Python/getplatform.o: $(srcdir)/Python/getplatform.c
@@ -236,25 +236,25 @@ Index: Python-2.7.9/Makefile.pre.in
236 236
237 Python/importdl.o: $(srcdir)/Python/importdl.c 237 Python/importdl.o: $(srcdir)/Python/importdl.c
238 $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c 238 $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
239Index: Python-2.7.9/Modules/getpath.c 239Index: Python-2.7.12/Modules/getpath.c
240=================================================================== 240===================================================================
241--- Python-2.7.9.orig/Modules/getpath.c 241--- Python-2.7.12.orig/Modules/getpath.c
242+++ Python-2.7.9/Modules/getpath.c 242+++ Python-2.7.12/Modules/getpath.c
243@@ -116,9 +116,11 @@ 243@@ -100,6 +100,13 @@
244 #define EXEC_PREFIX PREFIX 244 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
245 #endif 245 #endif
246 246
247+#define LIB_PYTHON LIB "/python" VERSION 247+#define LIB_PYTHON LIB "/python" VERSION
248+ 248+
249 #ifndef PYTHONPATH 249+#ifndef PYTHONPATH
250-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
251- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
252+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ 250+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
253+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" 251+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
254 #endif 252+#endif
255 253+
256 #ifndef LANDMARK 254 #ifndef LANDMARK
257@@ -129,7 +131,7 @@ static char prefix[MAXPATHLEN+1]; 255 #define LANDMARK "os.py"
256 #endif
257@@ -108,7 +115,7 @@ static char prefix[MAXPATHLEN+1];
258 static char exec_prefix[MAXPATHLEN+1]; 258 static char exec_prefix[MAXPATHLEN+1];
259 static char progpath[MAXPATHLEN+1]; 259 static char progpath[MAXPATHLEN+1];
260 static char *module_search_path = NULL; 260 static char *module_search_path = NULL;
@@ -263,10 +263,10 @@ Index: Python-2.7.9/Modules/getpath.c
263 263
264 static void 264 static void
265 reduce(char *dir) 265 reduce(char *dir)
266Index: Python-2.7.9/Python/getplatform.c 266Index: Python-2.7.12/Python/getplatform.c
267=================================================================== 267===================================================================
268--- Python-2.7.9.orig/Python/getplatform.c 268--- Python-2.7.12.orig/Python/getplatform.c
269+++ Python-2.7.9/Python/getplatform.c 269+++ Python-2.7.12/Python/getplatform.c
270@@ -10,3 +10,13 @@ Py_GetPlatform(void) 270@@ -10,3 +10,13 @@ Py_GetPlatform(void)
271 { 271 {
272 return PLATFORM; 272 return PLATFORM;
@@ -281,10 +281,10 @@ Index: Python-2.7.9/Python/getplatform.c
281+{ 281+{
282+ return LIB; 282+ return LIB;
283+} 283+}
284Index: Python-2.7.9/Python/sysmodule.c 284Index: Python-2.7.12/Python/sysmodule.c
285=================================================================== 285===================================================================
286--- Python-2.7.9.orig/Python/sysmodule.c 286--- Python-2.7.12.orig/Python/sysmodule.c
287+++ Python-2.7.9/Python/sysmodule.c 287+++ Python-2.7.12/Python/sysmodule.c
288@@ -1437,6 +1437,8 @@ _PySys_Init(void) 288@@ -1437,6 +1437,8 @@ _PySys_Init(void)
289 PyString_FromString(Py_GetCopyright())); 289 PyString_FromString(Py_GetCopyright()));
290 SET_SYS_FROM_STRING("platform", 290 SET_SYS_FROM_STRING("platform",
diff --git a/meta/recipes-devtools/python/python_2.7.11.bb b/meta/recipes-devtools/python/python_2.7.12.bb
index 1e4a30d1ff..3ee1e38b66 100644
--- a/meta/recipes-devtools/python/python_2.7.11.bb
+++ b/meta/recipes-devtools/python/python_2.7.12.bb
@@ -25,9 +25,7 @@ SRC_URI += "\
25 file://run-ptest \ 25 file://run-ptest \
26 file://parallel-makeinst-create-bindir.patch \ 26 file://parallel-makeinst-create-bindir.patch \
27 file://use_sysroot_ncurses_instead_of_host.patch \ 27 file://use_sysroot_ncurses_instead_of_host.patch \
28 file://avoid_parallel_make_races_on_pgen.patch \
29 file://add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \ 28 file://add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \
30 file://CVE-2016-5636.patch \
31" 29"
32 30
33S = "${WORKDIR}/Python-${PV}" 31S = "${WORKDIR}/Python-${PV}"