diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2015-02-11 17:57:49 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-23 17:35:29 +0000 |
commit | cb02ecb507ddad3cb17c78020b42c004aa2903ae (patch) | |
tree | 0f30353b3c8a3aaf6294f8db9c8fb7cff5575ab9 /meta/recipes-devtools/python/python/builddir.patch | |
parent | 122ee11bd1817f776336e54898cb36162fe527df (diff) | |
download | poky-cb02ecb507ddad3cb17c78020b42c004aa2903ae.tar.gz |
Python: Upgrade from 2.7.3 to 2.7.9:
- Based on Paul Eggletons work to partially upgrade to Python 2.7.6
Modified:
default-versions.inc: switched to python 2.7.9
generate-manifest-2.7.py: fixed _sysconfigdata
python-2.7-manifest.inc: fixed _sysconfigdata
python.inc: Updated checksums and source, no LICENSE
change just updated some dates
python-native_2.7.3 -> python-native_2.7.9 and updated patches
python_2.7.3 -> python_2.7.9, and added ac_cv_file__dev_ptmx=no
ac_cv_file__dev_ptc=no in EXTRA_OECONF to solve python
issue #3754, only needed when cross compiling, also updated patches
use_sysroot_ncurses_instead_of_host.patch: New patch to use ncursesw
from sysroot instead of hosts, introduced by fix for python issue #15268
Rebased:
01-use-proper-tools-for-cross-build.patch
03-fix-tkinter-detection.patch
05-enable-ctypes-cross-build.patch
06-avoid_usr_lib_termcap_path_in_linking.patch
avoid_warning_about_tkinter.patch
builddir.patch
fix_for_using_different_libdir.patch
host_include_contamination.patch
multilib.patch
nohostlibs.patch
search_db_h_in_inc_dirs_and_avoid_warning.patch
Deleted (fixed on upstream):
06-ctypes-libffi-fix-configure.patch
CVE-2013-4073_py27.patch
gcc-4.8-fix-configure-Wformat.patch
json-flaw-fix.patch
posix_close.patch
pypirc-secure.patch
python-2.7.3-CVE-2012-2135.patch
python-2.7.3-CVE-2013-1752-smtplib-fix.patch
python-2.7.3-CVE-2014-1912.patch
python-2.7.3-CVE-2014-7185.patch
python-2.7.3-berkeley-db-5.3.patch
python-fix-build-error-with-Readline-6.3.patch
remove-BOM-insection-code.patch
remove_sqlite_rpath.patch
python2.7.3-nossl3.patch
[YOCTO #7059]
(From OE-Core rev: d4ad95f0d5f08891637c644e85b09da9c4585059)
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/builddir.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/builddir.patch | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/meta/recipes-devtools/python/python/builddir.patch b/meta/recipes-devtools/python/python/builddir.patch index 930170b95a..ad629a022e 100644 --- a/meta/recipes-devtools/python/python/builddir.patch +++ b/meta/recipes-devtools/python/python/builddir.patch | |||
@@ -7,11 +7,11 @@ python recipe. | |||
7 | Upstream-Status: Inappropriate | 7 | Upstream-Status: Inappropriate |
8 | RP 2012/11/13 | 8 | RP 2012/11/13 |
9 | 9 | ||
10 | Index: Python-2.7.3/Lib/sysconfig.py | 10 | Index: Python-2.7.9/Lib/sysconfig.py |
11 | =================================================================== | 11 | =================================================================== |
12 | --- Python-2.7.3.orig/Lib/sysconfig.py 2012-11-13 14:36:08.429167199 +0000 | 12 | --- Python-2.7.9.orig/Lib/sysconfig.py |
13 | +++ Python-2.7.3/Lib/sysconfig.py 2012-11-13 21:58:31.788551800 +0000 | 13 | +++ Python-2.7.9/Lib/sysconfig.py |
14 | @@ -93,6 +93,7 @@ | 14 | @@ -93,6 +93,7 @@ _PREFIX = os.path.normpath(sys.prefix) |
15 | _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) | 15 | _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) |
16 | _CONFIG_VARS = None | 16 | _CONFIG_VARS = None |
17 | _USER_BASE = None | 17 | _USER_BASE = None |
@@ -19,7 +19,7 @@ Index: Python-2.7.3/Lib/sysconfig.py | |||
19 | 19 | ||
20 | def _safe_realpath(path): | 20 | def _safe_realpath(path): |
21 | try: | 21 | try: |
22 | @@ -100,7 +102,9 @@ | 22 | @@ -100,7 +101,9 @@ def _safe_realpath(path): |
23 | except OSError: | 23 | except OSError: |
24 | return path | 24 | return path |
25 | 25 | ||
@@ -30,11 +30,11 @@ Index: Python-2.7.3/Lib/sysconfig.py | |||
30 | _PROJECT_BASE = os.path.dirname(_safe_realpath(sys.executable)) | 30 | _PROJECT_BASE = os.path.dirname(_safe_realpath(sys.executable)) |
31 | else: | 31 | else: |
32 | # sys.executable can be empty if argv[0] has been changed and Python is | 32 | # sys.executable can be empty if argv[0] has been changed and Python is |
33 | Index: Python-2.7.3/Lib/distutils/sysconfig.py | 33 | Index: Python-2.7.9/Lib/distutils/sysconfig.py |
34 | =================================================================== | 34 | =================================================================== |
35 | --- Python-2.7.3.orig/Lib/distutils/sysconfig.py 2012-11-13 14:36:08.005167209 +0000 | 35 | --- Python-2.7.9.orig/Lib/distutils/sysconfig.py |
36 | +++ Python-2.7.3/Lib/distutils/sysconfig.py 2012-11-13 22:07:05.644540695 +0000 | 36 | +++ Python-2.7.9/Lib/distutils/sysconfig.py |
37 | @@ -26,6 +26,9 @@ | 37 | @@ -26,6 +26,9 @@ EXEC_PREFIX = os.path.normpath(sys.exec_ |
38 | # live in project/PCBuild9. If we're dealing with an x64 Windows build, | 38 | # live in project/PCBuild9. If we're dealing with an x64 Windows build, |
39 | # it'll live in project/PCbuild/amd64. | 39 | # it'll live in project/PCbuild/amd64. |
40 | project_base = os.path.dirname(os.path.abspath(sys.executable)) | 40 | project_base = os.path.dirname(os.path.abspath(sys.executable)) |
@@ -44,12 +44,3 @@ Index: Python-2.7.3/Lib/distutils/sysconfig.py | |||
44 | if os.name == "nt" and "pcbuild" in project_base[-8:].lower(): | 44 | if os.name == "nt" and "pcbuild" in project_base[-8:].lower(): |
45 | project_base = os.path.abspath(os.path.join(project_base, os.path.pardir)) | 45 | project_base = os.path.abspath(os.path.join(project_base, os.path.pardir)) |
46 | # PC/VS7.1 | 46 | # PC/VS7.1 |
47 | @@ -247,7 +250,7 @@ | ||
48 | def get_makefile_filename(): | ||
49 | """Return full pathname of installed Makefile from the Python build.""" | ||
50 | if python_build: | ||
51 | - return os.path.join(os.path.dirname(sys.executable), "Makefile") | ||
52 | + return os.path.join(project_base, "Makefile") | ||
53 | lib_dir = get_python_lib(plat_specific=1, standard_lib=1) | ||
54 | return os.path.join(lib_dir, "config", "Makefile") | ||
55 | |||