diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2012-04-05 23:54:24 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-26 10:05:16 +0100 |
commit | 27cd16fa12a43b7db7faf46c16464ffb029e225b (patch) | |
tree | 0c3f69d5d83fa1034f3eb62046ec4056a484c23d /meta/recipes-devtools | |
parent | 3d8284487d354717f747efd188cd0b6b211f4bd1 (diff) | |
download | poky-27cd16fa12a43b7db7faf46c16464ffb029e225b.tar.gz |
python: Add patch to avoid warning about _tkinter
_tkinter module needs tk module along with tcl. tk is not yet integrated
in yocto so we skip the check for this module.
Avoid a warning by not adding this module to missing variable.
[YOCTO #1937]
(From OE-Core rev: 3f1be431054b3947bee9a2503eea1a3cefb38f4c)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch | 25 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python_2.7.2.bb | 3 |
2 files changed, 27 insertions, 1 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 new file mode 100644 index 0000000000..208c57c822 --- /dev/null +++ b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | _tkinter module needs tk module along with tcl. tk is not yet integrated | ||
2 | in yocto so we skip the check for this module. | ||
3 | Avoid a warning by not adding this module to missing variable. | ||
4 | |||
5 | Upstream-Status: Inappropriate [distribution] | ||
6 | |||
7 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
8 | |||
9 | Index: Python-2.7.2/setup.py | ||
10 | =================================================================== | ||
11 | --- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 | ||
12 | +++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 | ||
13 | @@ -1634,8 +1634,10 @@ | ||
14 | # Call the method for detecting whether _tkinter can be compiled | ||
15 | self.detect_tkinter(inc_dirs, lib_dirs) | ||
16 | |||
17 | - if '_tkinter' not in [e.name for e in self.extensions]: | ||
18 | - missing.append('_tkinter') | ||
19 | + # tkinter module will not be avalaible as yocto | ||
20 | + # doesn't have tk integrated (yet) | ||
21 | + #if '_tkinter' not in [e.name for e in self.extensions]: | ||
22 | + # missing.append('_tkinter') | ||
23 | |||
24 | return missing | ||
25 | |||
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index 9c53fc6cde..d35f0dd819 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require python.inc | 1 | require python.inc |
2 | DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" | 2 | DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" |
3 | PR = "${INC_PR}.18" | 3 | PR = "${INC_PR}.19" |
4 | 4 | ||
5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | 5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" |
6 | DISTRO_SRC_URI_linuxstdbase = "" | 6 | DISTRO_SRC_URI_linuxstdbase = "" |
@@ -25,6 +25,7 @@ SRC_URI += "\ | |||
25 | file://check-if-target-is-64b-not-host.patch \ | 25 | file://check-if-target-is-64b-not-host.patch \ |
26 | file://search_db_h_in_inc_dirs_and_avoid_warning.patch \ | 26 | file://search_db_h_in_inc_dirs_and_avoid_warning.patch \ |
27 | file://avoid_warning_about_bsddb.patch \ | 27 | file://avoid_warning_about_bsddb.patch \ |
28 | file://avoid_warning_about_tkinter.patch \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | S = "${WORKDIR}/Python-${PV}" | 31 | S = "${WORKDIR}/Python-${PV}" |