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>
This commit is contained in:
parent
35855a02f8
commit
40738af46b
|
@ -4,8 +4,8 @@
|
|||
|
||||
# Force the python versions in one place
|
||||
PYTHON_BASEVERSION ?= "2.7"
|
||||
PREFERRED_VERSION_python ?= "2.7.9"
|
||||
PREFERRED_VERSION_python-native ?= "2.7.9"
|
||||
PREFERRED_VERSION_python ?= "2.7.11"
|
||||
PREFERRED_VERSION_python-native ?= "2.7.11"
|
||||
|
||||
# Force the older version of liberation-fonts until we fix the fontforge issue
|
||||
PREFERRED_VERSION_liberation-fonts ?= "1.04"
|
||||
|
|
|
@ -5,12 +5,12 @@ SECTION = "devel/python"
|
|||
# bump this on every change in contrib/python/generate-manifest-2.7.py
|
||||
INC_PR = "r1"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=dff3d00f049545862992d2d097831a13"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
|
||||
|
||||
SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz"
|
||||
|
||||
SRC_URI[md5sum] = "38d530f7efc373d64a8fb1637e3baaa7"
|
||||
SRC_URI[sha256sum] = "90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916"
|
||||
SRC_URI[md5sum] = "1dbcc848b4cd8399a8199d000f9f823c"
|
||||
SRC_URI[sha256sum] = "962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46"
|
||||
|
||||
# python recipe is actually python 2.x
|
||||
# also, exclude pre-releases for both python 2.x and 3.x
|
||||
|
|
|
@ -13,19 +13,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 87a4f02..f20cc7b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
Index: Python-2.7.11/configure.ac
|
||||
===================================================================
|
||||
--- Python-2.7.11.orig/configure.ac
|
||||
+++ Python-2.7.11/configure.ac
|
||||
@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then
|
||||
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
|
||||
fi
|
||||
AC_MSG_RESULT($interp)
|
||||
- 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
|
||||
- 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
|
||||
+ 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
|
||||
fi
|
||||
elif test "$cross_compiling" = maybe; then
|
||||
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
|
|
@ -11,11 +11,11 @@ Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
|
|||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: Python-2.7.2/setup.py
|
||||
Index: Python-2.7.11/setup.py
|
||||
===================================================================
|
||||
--- Python-2.7.2.orig/setup.py 2012-03-25 01:10:41.540163187 +0200
|
||||
+++ Python-2.7.2/setup.py 2012-03-25 01:26:06.092539990 +0200
|
||||
@@ -23,6 +23,21 @@
|
||||
--- Python-2.7.11.orig/setup.py
|
||||
+++ Python-2.7.11/setup.py
|
||||
@@ -35,6 +35,21 @@ COMPILED_WITH_PYDEBUG = ('--with-pydebug
|
||||
# This global variable is used to hold the list of modules to be disabled.
|
||||
disabled_module_list = []
|
||||
|
||||
|
@ -37,16 +37,16 @@ Index: Python-2.7.2/setup.py
|
|||
def add_dir_to_list(dirlist, dir):
|
||||
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
|
||||
1) 'dir' is not already in 'dirlist'
|
||||
@@ -628,7 +643,7 @@
|
||||
@@ -716,7 +731,7 @@ class PyBuildExt(build_ext):
|
||||
exts.append( Extension('audioop', ['audioop.c']) )
|
||||
|
||||
# Disabled on 64-bit platforms
|
||||
- if sys.maxint != 9223372036854775807L:
|
||||
- if sys.maxsize != 9223372036854775807L:
|
||||
+ if not target_is_64bit_platform():
|
||||
# Operations on images
|
||||
exts.append( Extension('imageop', ['imageop.c']) )
|
||||
else:
|
||||
@@ -1418,7 +1433,7 @@
|
||||
@@ -1545,7 +1560,7 @@ class PyBuildExt(build_ext):
|
||||
missing.append('_codecs_%s' % loc)
|
||||
|
||||
# Dynamic loading module
|
||||
|
@ -54,4 +54,4 @@ Index: Python-2.7.2/setup.py
|
|||
+ if not target_is_64bit_platform():
|
||||
# This requires sizeof(int) == sizeof(long) == sizeof(char*)
|
||||
dl_inc = find_file('dlfcn.h', [], inc_dirs)
|
||||
if (dl_inc is not None) and (platform not in ['atheos']):
|
||||
if (dl_inc is not None) and (host_platform not in ['atheos']):
|
||||
|
|
Loading…
Reference in New Issue