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/avoid_warning_about_tkinter.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/avoid_warning_about_tkinter.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch index bedc3909d8..208c57c822 100644 --- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch +++ b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch | |||
@@ -2,22 +2,17 @@ _tkinter module needs tk module along with tcl. tk is not yet integrated | |||
2 | in yocto so we skip the check for this module. | 2 | in yocto so we skip the check for this module. |
3 | Avoid a warning by not adding this module to missing variable. | 3 | Avoid a warning by not adding this module to missing variable. |
4 | 4 | ||
5 | Also simply disable the tk module since its not in DEPENDS. | ||
6 | |||
7 | Upstream-Status: Inappropriate [distribution] | 5 | Upstream-Status: Inappropriate [distribution] |
8 | 6 | ||
9 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | 7 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
10 | 8 | ||
11 | Index: Python-2.7.3/setup.py | 9 | Index: Python-2.7.2/setup.py |
12 | =================================================================== | 10 | =================================================================== |
13 | --- Python-2.7.3.orig/setup.py 2014-07-07 13:45:15.056233820 +0000 | 11 | --- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 |
14 | +++ Python-2.7.3/setup.py 2014-07-16 16:06:37.145656284 +0000 | 12 | +++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 |
15 | @@ -1639,10 +1639,12 @@ | 13 | @@ -1634,8 +1634,10 @@ |
16 | self.extensions.extend(exts) | ||
17 | |||
18 | # Call the method for detecting whether _tkinter can be compiled | 14 | # Call the method for detecting whether _tkinter can be compiled |
19 | - self.detect_tkinter(inc_dirs, lib_dirs) | 15 | self.detect_tkinter(inc_dirs, lib_dirs) |
20 | + #self.detect_tkinter(inc_dirs, lib_dirs) | ||
21 | 16 | ||
22 | - if '_tkinter' not in [e.name for e in self.extensions]: | 17 | - if '_tkinter' not in [e.name for e in self.extensions]: |
23 | - missing.append('_tkinter') | 18 | - missing.append('_tkinter') |