summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-08-03 18:49:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:30 +0100
commitdb9508891b6985d3467ce7a04e12f75a07fa756f (patch)
tree52418e3519584282e6abf1460bafa90f0b904bec /meta/recipes-devtools/python
parent909e2120d40c7f0b44be13928899bc6d4675f70d (diff)
downloadpoky-db9508891b6985d3467ce7a04e12f75a07fa756f.tar.gz
python-native: Upgrade from 2.7.11 to 2.7.12
LICENSE did not change, only dates changed. Rebases: - debug.patch - multilib.patch Upstream: - avoid_parallel_make_races_on_pgen.patch (From OE-Core rev: dce8e8bb274c2f7c01dd21e1ecfd47bc3f1b4e13) 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/python')
-rw-r--r--meta/recipes-devtools/python/python-native/debug.patch17
-rw-r--r--meta/recipes-devtools/python/python-native/multilib.patch96
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.12.bb (renamed from meta/recipes-devtools/python/python-native_2.7.11.bb)2
-rw-r--r--meta/recipes-devtools/python/python.inc6
4 files changed, 62 insertions, 59 deletions
diff --git a/meta/recipes-devtools/python/python-native/debug.patch b/meta/recipes-devtools/python/python-native/debug.patch
index 5ec10d6b20..3617882640 100644
--- a/meta/recipes-devtools/python/python-native/debug.patch
+++ b/meta/recipes-devtools/python/python-native/debug.patch
@@ -1,24 +1,27 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: Python-2.6.1/Lib/distutils/unixccompiler.py 3Index: Python-2.7.12/Lib/distutils/unixccompiler.py
4=================================================================== 4===================================================================
5--- Python-2.6.1.orig/Lib/distutils/unixccompiler.py 2009-11-13 16:04:54.000000000 +0000 5--- Python-2.7.12.orig/Lib/distutils/unixccompiler.py
6+++ Python-2.6.1/Lib/distutils/unixccompiler.py 2009-11-13 16:06:27.000000000 +0000 6+++ Python-2.7.12/Lib/distutils/unixccompiler.py
7@@ -300,6 +300,8 @@ 7@@ -278,6 +278,8 @@ class UnixCCompiler(CCompiler):
8 dylib_f = self.library_filename(lib, lib_type='dylib') 8
9 static_f = self.library_filename(lib, lib_type='static') 9
10 10
11+ print "Looking in %s for %s" % (lib, dirs) 11+ print "Looking in %s for %s" % (lib, dirs)
12+ 12+
13 for dir in dirs: 13 for dir in dirs:
14 shared = os.path.join(dir, shared_f) 14 shared = os.path.join(dir, shared_f)
15 dylib = os.path.join(dir, dylib_f) 15 dylib = os.path.join(dir, dylib_f)
16@@ -309,10 +311,13 @@ 16@@ -298,12 +300,16 @@ class UnixCCompiler(CCompiler):
17 # assuming that *all* Unix C compilers do. And of course I'm 17 # assuming that *all* Unix C compilers do. And of course I'm
18 # ignoring even GCC's "-static" option. So sue me. 18 # ignoring even GCC's "-static" option. So sue me.
19 if os.path.exists(dylib): 19 if os.path.exists(dylib):
20+ print "Found %s" % (dylib) 20+ print "Found %s" % (dylib)
21 return dylib 21 return dylib
22 elif os.path.exists(xcode_stub):
23+ print "Found %s" % (xcode_stub)
24 return xcode_stub
22 elif os.path.exists(shared): 25 elif os.path.exists(shared):
23+ print "Found %s" % (shared) 26+ print "Found %s" % (shared)
24 return shared 27 return shared
diff --git a/meta/recipes-devtools/python/python-native/multilib.patch b/meta/recipes-devtools/python/python-native/multilib.patch
index 8d475e9960..916b40f4ab 100644
--- a/meta/recipes-devtools/python/python-native/multilib.patch
+++ b/meta/recipes-devtools/python/python-native/multilib.patch
@@ -12,10 +12,10 @@ Upstream-Status: Inappropriate [oe-specific]
12 12
13Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 13Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
14 14
15Index: Python-2.7.9/Include/pythonrun.h 15Index: Python-2.7.12/Include/pythonrun.h
16=================================================================== 16===================================================================
17--- Python-2.7.9.orig/Include/pythonrun.h 17--- Python-2.7.12.orig/Include/pythonrun.h
18+++ Python-2.7.9/Include/pythonrun.h 18+++ Python-2.7.12/Include/pythonrun.h
19@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); 19@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void);
20 /* In their own files */ 20 /* In their own files */
21 PyAPI_FUNC(const char *) Py_GetVersion(void); 21 PyAPI_FUNC(const char *) Py_GetVersion(void);
@@ -24,10 +24,10 @@ Index: Python-2.7.9/Include/pythonrun.h
24 PyAPI_FUNC(const char *) Py_GetCopyright(void); 24 PyAPI_FUNC(const char *) Py_GetCopyright(void);
25 PyAPI_FUNC(const char *) Py_GetCompiler(void); 25 PyAPI_FUNC(const char *) Py_GetCompiler(void);
26 PyAPI_FUNC(const char *) Py_GetBuildInfo(void); 26 PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
27Index: Python-2.7.9/Lib/distutils/command/install.py 27Index: Python-2.7.12/Lib/distutils/command/install.py
28=================================================================== 28===================================================================
29--- Python-2.7.9.orig/Lib/distutils/command/install.py 29--- Python-2.7.12.orig/Lib/distutils/command/install.py
30+++ Python-2.7.9/Lib/distutils/command/install.py 30+++ Python-2.7.12/Lib/distutils/command/install.py
31@@ -22,6 +22,8 @@ from site import USER_BASE 31@@ -22,6 +22,8 @@ from site import USER_BASE
32 from site import USER_SITE 32 from site import USER_SITE
33 33
@@ -46,11 +46,11 @@ Index: Python-2.7.9/Lib/distutils/command/install.py
46 'headers': '$base/include/python$py_version_short/$dist_name', 46 'headers': '$base/include/python$py_version_short/$dist_name',
47 'scripts': '$base/bin', 47 'scripts': '$base/bin',
48 'data' : '$base', 48 'data' : '$base',
49Index: Python-2.7.9/Lib/pydoc.py 49Index: Python-2.7.12/Lib/pydoc.py
50=================================================================== 50===================================================================
51--- Python-2.7.9.orig/Lib/pydoc.py 51--- Python-2.7.12.orig/Lib/pydoc.py
52+++ Python-2.7.9/Lib/pydoc.py 52+++ Python-2.7.12/Lib/pydoc.py
53@@ -383,7 +383,7 @@ class Doc: 53@@ -384,7 +384,7 @@ class Doc:
54 54
55 docloc = os.environ.get("PYTHONDOCS", 55 docloc = os.environ.get("PYTHONDOCS",
56 "http://docs.python.org/library") 56 "http://docs.python.org/library")
@@ -59,10 +59,10 @@ Index: Python-2.7.9/Lib/pydoc.py
59 "python"+sys.version[0:3]) 59 "python"+sys.version[0:3])
60 if (isinstance(object, type(os)) and 60 if (isinstance(object, type(os)) and
61 (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', 61 (object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
62Index: Python-2.7.9/Lib/site.py 62Index: Python-2.7.12/Lib/site.py
63=================================================================== 63===================================================================
64--- Python-2.7.9.orig/Lib/site.py 64--- Python-2.7.12.orig/Lib/site.py
65+++ Python-2.7.9/Lib/site.py 65+++ Python-2.7.12/Lib/site.py
66@@ -288,13 +288,19 @@ def getsitepackages(): 66@@ -288,13 +288,19 @@ def getsitepackages():
67 if sys.platform in ('os2emx', 'riscos'): 67 if sys.platform in ('os2emx', 'riscos'):
68 sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) 68 sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
@@ -86,10 +86,10 @@ Index: Python-2.7.9/Lib/site.py
86 if sys.platform == "darwin": 86 if sys.platform == "darwin":
87 # for framework builds *only* we add the standard Apple 87 # for framework builds *only* we add the standard Apple
88 # locations. 88 # locations.
89Index: Python-2.7.9/Lib/test/test_dl.py 89Index: Python-2.7.12/Lib/test/test_dl.py
90=================================================================== 90===================================================================
91--- Python-2.7.9.orig/Lib/test/test_dl.py 91--- Python-2.7.12.orig/Lib/test/test_dl.py
92+++ Python-2.7.9/Lib/test/test_dl.py 92+++ Python-2.7.12/Lib/test/test_dl.py
93@@ -4,10 +4,11 @@ 93@@ -4,10 +4,11 @@
94 import unittest 94 import unittest
95 from test.test_support import verbose, import_module 95 from test.test_support import verbose, import_module
@@ -104,10 +104,10 @@ Index: Python-2.7.9/Lib/test/test_dl.py
104 ('/usr/bin/cygwin1.dll', 'getpid'), 104 ('/usr/bin/cygwin1.dll', 'getpid'),
105 ('/usr/lib/libc.dylib', 'getpid'), 105 ('/usr/lib/libc.dylib', 'getpid'),
106 ] 106 ]
107Index: Python-2.7.9/Lib/trace.py 107Index: Python-2.7.12/Lib/trace.py
108=================================================================== 108===================================================================
109--- Python-2.7.9.orig/Lib/trace.py 109--- Python-2.7.12.orig/Lib/trace.py
110+++ Python-2.7.9/Lib/trace.py 110+++ Python-2.7.12/Lib/trace.py
111@@ -754,10 +754,10 @@ def main(argv=None): 111@@ -754,10 +754,10 @@ def main(argv=None):
112 # should I also call expanduser? (after all, could use $HOME) 112 # should I also call expanduser? (after all, could use $HOME)
113 113
@@ -121,11 +121,11 @@ Index: Python-2.7.9/Lib/trace.py
121 "python" + sys.version[:3])) 121 "python" + sys.version[:3]))
122 s = os.path.normpath(s) 122 s = os.path.normpath(s)
123 ignore_dirs.append(s) 123 ignore_dirs.append(s)
124Index: Python-2.7.9/Makefile.pre.in 124Index: Python-2.7.12/Makefile.pre.in
125=================================================================== 125===================================================================
126--- Python-2.7.9.orig/Makefile.pre.in 126--- Python-2.7.12.orig/Makefile.pre.in
127+++ Python-2.7.9/Makefile.pre.in 127+++ Python-2.7.12/Makefile.pre.in
128@@ -87,6 +87,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG 128@@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
129 129
130 # Machine-dependent subdirectories 130 # Machine-dependent subdirectories
131 MACHDEP= @MACHDEP@ 131 MACHDEP= @MACHDEP@
@@ -133,7 +133,7 @@ Index: Python-2.7.9/Makefile.pre.in
133 133
134 # Multiarch directory (may be empty) 134 # Multiarch directory (may be empty)
135 MULTIARCH= @MULTIARCH@ 135 MULTIARCH= @MULTIARCH@
136@@ -106,7 +107,7 @@ LIBDIR= @libdir@ 136@@ -111,7 +112,7 @@ LIBDIR= @libdir@
137 MANDIR= @mandir@ 137 MANDIR= @mandir@
138 INCLUDEDIR= @includedir@ 138 INCLUDEDIR= @includedir@
139 CONFINCLUDEDIR= $(exec_prefix)/include 139 CONFINCLUDEDIR= $(exec_prefix)/include
@@ -142,7 +142,7 @@ Index: Python-2.7.9/Makefile.pre.in
142 142
143 # Detailed destination directories 143 # Detailed destination directories
144 BINLIBDEST= $(LIBDIR)/python$(VERSION) 144 BINLIBDEST= $(LIBDIR)/python$(VERSION)
145@@ -597,6 +598,7 @@ Modules/getpath.o: $(srcdir)/Modules/get 145@@ -669,6 +670,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
146 -DEXEC_PREFIX='"$(exec_prefix)"' \ 146 -DEXEC_PREFIX='"$(exec_prefix)"' \
147 -DVERSION='"$(VERSION)"' \ 147 -DVERSION='"$(VERSION)"' \
148 -DVPATH='"$(VPATH)"' \ 148 -DVPATH='"$(VPATH)"' \
@@ -150,7 +150,7 @@ Index: Python-2.7.9/Makefile.pre.in
150 -o $@ $(srcdir)/Modules/getpath.c 150 -o $@ $(srcdir)/Modules/getpath.c
151 151
152 Modules/python.o: $(srcdir)/Modules/python.c 152 Modules/python.o: $(srcdir)/Modules/python.c
153@@ -639,7 +641,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) 153@@ -720,7 +722,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
154 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) 154 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
155 155
156 Python/getplatform.o: $(srcdir)/Python/getplatform.c 156 Python/getplatform.o: $(srcdir)/Python/getplatform.c
@@ -159,25 +159,25 @@ Index: Python-2.7.9/Makefile.pre.in
159 159
160 Python/importdl.o: $(srcdir)/Python/importdl.c 160 Python/importdl.o: $(srcdir)/Python/importdl.c
161 $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c 161 $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
162Index: Python-2.7.9/Modules/getpath.c 162Index: Python-2.7.12/Modules/getpath.c
163=================================================================== 163===================================================================
164--- Python-2.7.9.orig/Modules/getpath.c 164--- Python-2.7.12.orig/Modules/getpath.c
165+++ Python-2.7.9/Modules/getpath.c 165+++ Python-2.7.12/Modules/getpath.c
166@@ -116,9 +116,11 @@ 166@@ -100,6 +100,13 @@
167 #define EXEC_PREFIX PREFIX 167 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
168 #endif 168 #endif
169 169
170+#define LIB_PYTHON LIB "/python" VERSION 170+#define LIB_PYTHON LIB "/python" VERSION
171+ 171+
172 #ifndef PYTHONPATH 172+#ifndef PYTHONPATH
173-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
174- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
175+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ 173+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
176+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" 174+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
177 #endif 175+#endif
178 176+
179 #ifndef LANDMARK 177 #ifndef LANDMARK
180@@ -129,7 +131,7 @@ static char prefix[MAXPATHLEN+1]; 178 #define LANDMARK "os.py"
179 #endif
180@@ -108,7 +115,7 @@ static char prefix[MAXPATHLEN+1];
181 static char exec_prefix[MAXPATHLEN+1]; 181 static char exec_prefix[MAXPATHLEN+1];
182 static char progpath[MAXPATHLEN+1]; 182 static char progpath[MAXPATHLEN+1];
183 static char *module_search_path = NULL; 183 static char *module_search_path = NULL;
@@ -186,10 +186,10 @@ Index: Python-2.7.9/Modules/getpath.c
186 186
187 static void 187 static void
188 reduce(char *dir) 188 reduce(char *dir)
189Index: Python-2.7.9/Python/getplatform.c 189Index: Python-2.7.12/Python/getplatform.c
190=================================================================== 190===================================================================
191--- Python-2.7.9.orig/Python/getplatform.c 191--- Python-2.7.12.orig/Python/getplatform.c
192+++ Python-2.7.9/Python/getplatform.c 192+++ Python-2.7.12/Python/getplatform.c
193@@ -10,3 +10,13 @@ Py_GetPlatform(void) 193@@ -10,3 +10,13 @@ Py_GetPlatform(void)
194 { 194 {
195 return PLATFORM; 195 return PLATFORM;
@@ -204,10 +204,10 @@ Index: Python-2.7.9/Python/getplatform.c
204+{ 204+{
205+ return LIB; 205+ return LIB;
206+} 206+}
207Index: Python-2.7.9/Python/sysmodule.c 207Index: Python-2.7.12/Python/sysmodule.c
208=================================================================== 208===================================================================
209--- Python-2.7.9.orig/Python/sysmodule.c 209--- Python-2.7.12.orig/Python/sysmodule.c
210+++ Python-2.7.9/Python/sysmodule.c 210+++ Python-2.7.12/Python/sysmodule.c
211@@ -1437,6 +1437,8 @@ _PySys_Init(void) 211@@ -1437,6 +1437,8 @@ _PySys_Init(void)
212 PyString_FromString(Py_GetCopyright())); 212 PyString_FromString(Py_GetCopyright()));
213 SET_SYS_FROM_STRING("platform", 213 SET_SYS_FROM_STRING("platform",
@@ -217,11 +217,11 @@ Index: Python-2.7.9/Python/sysmodule.c
217 SET_SYS_FROM_STRING("executable", 217 SET_SYS_FROM_STRING("executable",
218 PyString_FromString(Py_GetProgramFullPath())); 218 PyString_FromString(Py_GetProgramFullPath()));
219 SET_SYS_FROM_STRING("prefix", 219 SET_SYS_FROM_STRING("prefix",
220Index: Python-2.7.9/configure.ac 220Index: Python-2.7.12/configure.ac
221=================================================================== 221===================================================================
222--- Python-2.7.9.orig/configure.ac 222--- Python-2.7.12.orig/configure.ac
223+++ Python-2.7.9/configure.ac 223+++ Python-2.7.12/configure.ac
224@@ -736,6 +736,11 @@ SunOS*) 224@@ -756,6 +756,11 @@ SunOS*)
225 ;; 225 ;;
226 esac 226 esac
227 227
diff --git a/meta/recipes-devtools/python/python-native_2.7.11.bb b/meta/recipes-devtools/python/python-native_2.7.12.bb
index 31192cafc9..de83cbd76a 100644
--- a/meta/recipes-devtools/python/python-native_2.7.11.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.12.bb
@@ -17,8 +17,8 @@ SRC_URI += "\
17 file://builddir.patch \ 17 file://builddir.patch \
18 file://parallel-makeinst-create-bindir.patch \ 18 file://parallel-makeinst-create-bindir.patch \
19 file://revert_use_of_sysconfigdata.patch \ 19 file://revert_use_of_sysconfigdata.patch \
20 file://avoid_parallel_make_races_on_pgen.patch \
21 " 20 "
21
22S = "${WORKDIR}/Python-${PV}" 22S = "${WORKDIR}/Python-${PV}"
23 23
24FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:" 24FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:"
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index f4818c6a87..79a431c7ea 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -5,12 +5,12 @@ SECTION = "devel/python"
5# bump this on every change in contrib/python/generate-manifest-2.7.py 5# bump this on every change in contrib/python/generate-manifest-2.7.py
6INC_PR = "r1" 6INC_PR = "r1"
7 7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=6b60258130e4ed10d3101517eb5b9385"
9 9
10SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz" 10SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz"
11 11
12SRC_URI[md5sum] = "1dbcc848b4cd8399a8199d000f9f823c" 12SRC_URI[md5sum] = "57dffcee9cee8bb2ab5f82af1d8e9a69"
13SRC_URI[sha256sum] = "962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46" 13SRC_URI[sha256sum] = "d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978"
14 14
15# python recipe is actually python 2.x 15# python recipe is actually python 2.x
16# also, exclude pre-releases for both python 2.x and 3.x 16# also, exclude pre-releases for both python 2.x and 3.x