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/03-fix-tkinter-detection.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/03-fix-tkinter-detection.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch index d74e4b1776..650ceb5951 100644 --- a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch +++ b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch | |||
@@ -1,14 +1,18 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | 1 | Upstream-Status: Inappropriate [embedded specific] |
2 | 2 | ||
3 | # We need to supply STAGING_INCDIR here, otherwise the Tk headers | 3 | We need to supply STAGING_INCDIR here, otherwise the Tk headers |
4 | # will not be found. | 4 | will not be found. |
5 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de> | ||
6 | 5 | ||
7 | Index: Python-2.6.1/setup.py | 6 | Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille.de> |
8 | =================================================================== | 7 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
9 | --- Python-2.6.1.orig/setup.py | 8 | |
10 | +++ Python-2.6.1/setup.py | 9 | Rebased for python-2.7.9 |
11 | @@ -1543,7 +1543,7 @@ class PyBuildExt(build_ext): | 10 | |
11 | diff --git a/setup.py b/setup.py | ||
12 | index 8fe1fb8..67eda74 100644 | ||
13 | --- a/setup.py | ||
14 | +++ b/setup.py | ||
15 | @@ -1892,7 +1892,7 @@ class PyBuildExt(build_ext): | ||
12 | dotversion = dotversion[:-1] + '.' + dotversion[-1] | 16 | dotversion = dotversion[:-1] + '.' + dotversion[-1] |
13 | tcl_include_sub = [] | 17 | tcl_include_sub = [] |
14 | tk_include_sub = [] | 18 | tk_include_sub = [] |
@@ -17,12 +21,12 @@ Index: Python-2.6.1/setup.py | |||
17 | tcl_include_sub += [dir + os.sep + "tcl" + dotversion] | 21 | tcl_include_sub += [dir + os.sep + "tcl" + dotversion] |
18 | tk_include_sub += [dir + os.sep + "tk" + dotversion] | 22 | tk_include_sub += [dir + os.sep + "tk" + dotversion] |
19 | tk_include_sub += tcl_include_sub | 23 | tk_include_sub += tcl_include_sub |
20 | @@ -1562,22 +1562,6 @@ class PyBuildExt(build_ext): | 24 | @@ -1911,22 +1911,6 @@ class PyBuildExt(build_ext): |
21 | if dir not in include_dirs: | 25 | if dir not in include_dirs: |
22 | include_dirs.append(dir) | 26 | include_dirs.append(dir) |
23 | 27 | ||
24 | - # Check for various platform-specific directories | 28 | - # Check for various platform-specific directories |
25 | - if platform == 'sunos5': | 29 | - if host_platform == 'sunos5': |
26 | - include_dirs.append('/usr/openwin/include') | 30 | - include_dirs.append('/usr/openwin/include') |
27 | - added_lib_dirs.append('/usr/openwin/lib') | 31 | - added_lib_dirs.append('/usr/openwin/lib') |
28 | - elif os.path.exists('/usr/X11R6/include'): | 32 | - elif os.path.exists('/usr/X11R6/include'): |
@@ -38,5 +42,5 @@ Index: Python-2.6.1/setup.py | |||
38 | - added_lib_dirs.append('/usr/X11/lib') | 42 | - added_lib_dirs.append('/usr/X11/lib') |
39 | - | 43 | - |
40 | # If Cygwin, then verify that X is installed before proceeding | 44 | # If Cygwin, then verify that X is installed before proceeding |
41 | if platform == 'cygwin': | 45 | if host_platform == 'cygwin': |
42 | x11_inc = find_file('X11/Xlib.h', [], include_dirs) | 46 | x11_inc = find_file('X11/Xlib.h', [], include_dirs) |