summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-01-19 22:47:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:07:14 +0000
commit40738af46b9f4347de43c245015bb21d42eb8036 (patch)
treef924a4249058fd24c90e625829939b1380e6cc4f /meta
parent35855a02f81d044c7a3d708719cd05f7dd11a389 (diff)
downloadpoky-40738af46b9f4347de43c245015bb21d42eb8036.tar.gz
python: Upgrade 2.7.9 > 2.7.11
- no license change, just dates Rebased: - check-if-target-is-64b-not-host.patch - add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch (From OE-Core rev: 9ed4ef038a4a8140accfa97b2eb6b75f8bed3693) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/default-versions.inc4
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.11.bb (renamed from meta/recipes-devtools/python/python-native_2.7.9.bb)0
-rw-r--r--meta/recipes-devtools/python/python.inc6
-rw-r--r--meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch13
-rw-r--r--meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch16
-rw-r--r--meta/recipes-devtools/python/python_2.7.11.bb (renamed from meta/recipes-devtools/python/python_2.7.9.bb)0
6 files changed, 18 insertions, 21 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 573063edfb..a04ea718bd 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -4,8 +4,8 @@
4 4
5# Force the python versions in one place 5# Force the python versions in one place
6PYTHON_BASEVERSION ?= "2.7" 6PYTHON_BASEVERSION ?= "2.7"
7PREFERRED_VERSION_python ?= "2.7.9" 7PREFERRED_VERSION_python ?= "2.7.11"
8PREFERRED_VERSION_python-native ?= "2.7.9" 8PREFERRED_VERSION_python-native ?= "2.7.11"
9 9
10# Force the older version of liberation-fonts until we fix the fontforge issue 10# Force the older version of liberation-fonts until we fix the fontforge issue
11PREFERRED_VERSION_liberation-fonts ?= "1.04" 11PREFERRED_VERSION_liberation-fonts ?= "1.04"
diff --git a/meta/recipes-devtools/python/python-native_2.7.9.bb b/meta/recipes-devtools/python/python-native_2.7.11.bb
index 34f5c2914e..34f5c2914e 100644
--- a/meta/recipes-devtools/python/python-native_2.7.9.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.11.bb
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 878f5826be..52250d27bb 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=dff3d00f049545862992d2d097831a13" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
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] = "38d530f7efc373d64a8fb1637e3baaa7" 12SRC_URI[md5sum] = "1dbcc848b4cd8399a8199d000f9f823c"
13SRC_URI[sha256sum] = "90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" 13SRC_URI[sha256sum] = "962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46"
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
diff --git a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
index 5ba54806eb..a97ff6b250 100644
--- a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
+++ b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
@@ -13,19 +13,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
13 configure.ac | 2 +- 13 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/configure.ac b/configure.ac 16Index: Python-2.7.11/configure.ac
17index 87a4f02..f20cc7b 100644 17===================================================================
18--- a/configure.ac 18--- Python-2.7.11.orig/configure.ac
19+++ b/configure.ac 19+++ Python-2.7.11/configure.ac
20@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then 20@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then
21 AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) 21 AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
22 fi 22 fi
23 AC_MSG_RESULT($interp) 23 AC_MSG_RESULT($interp)
24- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp 24- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
25+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp 25+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
26 fi 26 fi
27 elif test "$cross_compiling" = maybe; then 27 elif test "$cross_compiling" = maybe; then
28 AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) 28 AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
29--
302.5.0
31
diff --git a/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch b/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
index 2b62db3826..e6d6c65bbe 100644
--- a/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
+++ b/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
@@ -11,11 +11,11 @@ Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
11 11
12Upstream-Status: Pending 12Upstream-Status: Pending
13 13
14Index: Python-2.7.2/setup.py 14Index: Python-2.7.11/setup.py
15=================================================================== 15===================================================================
16--- Python-2.7.2.orig/setup.py 2012-03-25 01:10:41.540163187 +0200 16--- Python-2.7.11.orig/setup.py
17+++ Python-2.7.2/setup.py 2012-03-25 01:26:06.092539990 +0200 17+++ Python-2.7.11/setup.py
18@@ -23,6 +23,21 @@ 18@@ -35,6 +35,21 @@ COMPILED_WITH_PYDEBUG = ('--with-pydebug
19 # This global variable is used to hold the list of modules to be disabled. 19 # This global variable is used to hold the list of modules to be disabled.
20 disabled_module_list = [] 20 disabled_module_list = []
21 21
@@ -37,16 +37,16 @@ Index: Python-2.7.2/setup.py
37 def add_dir_to_list(dirlist, dir): 37 def add_dir_to_list(dirlist, dir):
38 """Add the directory 'dir' to the list 'dirlist' (at the front) if 38 """Add the directory 'dir' to the list 'dirlist' (at the front) if
39 1) 'dir' is not already in 'dirlist' 39 1) 'dir' is not already in 'dirlist'
40@@ -628,7 +643,7 @@ 40@@ -716,7 +731,7 @@ class PyBuildExt(build_ext):
41 exts.append( Extension('audioop', ['audioop.c']) ) 41 exts.append( Extension('audioop', ['audioop.c']) )
42 42
43 # Disabled on 64-bit platforms 43 # Disabled on 64-bit platforms
44- if sys.maxint != 9223372036854775807L: 44- if sys.maxsize != 9223372036854775807L:
45+ if not target_is_64bit_platform(): 45+ if not target_is_64bit_platform():
46 # Operations on images 46 # Operations on images
47 exts.append( Extension('imageop', ['imageop.c']) ) 47 exts.append( Extension('imageop', ['imageop.c']) )
48 else: 48 else:
49@@ -1418,7 +1433,7 @@ 49@@ -1545,7 +1560,7 @@ class PyBuildExt(build_ext):
50 missing.append('_codecs_%s' % loc) 50 missing.append('_codecs_%s' % loc)
51 51
52 # Dynamic loading module 52 # Dynamic loading module
@@ -54,4 +54,4 @@ Index: Python-2.7.2/setup.py
54+ if not target_is_64bit_platform(): 54+ if not target_is_64bit_platform():
55 # This requires sizeof(int) == sizeof(long) == sizeof(char*) 55 # This requires sizeof(int) == sizeof(long) == sizeof(char*)
56 dl_inc = find_file('dlfcn.h', [], inc_dirs) 56 dl_inc = find_file('dlfcn.h', [], inc_dirs)
57 if (dl_inc is not None) and (platform not in ['atheos']): 57 if (dl_inc is not None) and (host_platform not in ['atheos']):
diff --git a/meta/recipes-devtools/python/python_2.7.9.bb b/meta/recipes-devtools/python/python_2.7.11.bb
index 0287c191ab..0287c191ab 100644
--- a/meta/recipes-devtools/python/python_2.7.9.bb
+++ b/meta/recipes-devtools/python/python_2.7.11.bb