mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-07 01:06:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

python: Upgrade 2.7.9 > 2.7.11

Browse Source 
- 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:
Alejandro Hernandez
2016-01-19 22:47:49 +00:00
committed by Richard Purdie
parent 35855a02f8
commit 40738af46b
6 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
View File

@@ -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

16
meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
View File

@@ -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']):