diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2016-01-19 22:47:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:07:14 +0000 |
commit | 40738af46b9f4347de43c245015bb21d42eb8036 (patch) | |
tree | f924a4249058fd24c90e625829939b1380e6cc4f /meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | |
parent | 35855a02f81d044c7a3d708719cd05f7dd11a389 (diff) | |
download | poky-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/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 13 |
1 files changed, 5 insertions, 8 deletions
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 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | Index: Python-2.7.11/configure.ac |
17 | index 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 | -- | ||
30 | 2.5.0 | ||
31 | |||