summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-16 16:09:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-17 12:28:51 +0100
commitd418bedca5ec8b897d0309c6ff7d56b3fd071822 (patch)
tree2f9070c1917648195bb1450c7f6cc0fa9cb0bc4d /meta/recipes-devtools/python
parentfe14f996bfbfd4555da9cbbfb0367be2a7e99b63 (diff)
downloadpoky-d418bedca5ec8b897d0309c6ff7d56b3fd071822.tar.gz
python: Forcibly disable tk
Avoids the determinism problem shown with the warnings: WARNING: QA Issue: python-tkinter rdepends on libx11 but its not a build dependency? [build-deps] WARNING: QA Issue: python-tkinter rdepends on tcl-lib but its not a build dependency? [build-deps (From OE-Core rev: 53ae544cfdac22c82af452b8c7ebe6664296bd9b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch15
1 files changed, 10 insertions, 5 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 208c57c822..bedc3909d8 100644
--- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
+++ b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
@@ -2,17 +2,22 @@ _tkinter module needs tk module along with tcl. tk is not yet integrated
2in yocto so we skip the check for this module. 2in yocto so we skip the check for this module.
3Avoid a warning by not adding this module to missing variable. 3Avoid a warning by not adding this module to missing variable.
4 4
5Also simply disable the tk module since its not in DEPENDS.
6
5Upstream-Status: Inappropriate [distribution] 7Upstream-Status: Inappropriate [distribution]
6 8
7Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
8 10
9Index: Python-2.7.2/setup.py 11Index: Python-2.7.3/setup.py
10=================================================================== 12===================================================================
11--- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 13--- Python-2.7.3.orig/setup.py 2014-07-07 13:45:15.056233820 +0000
12+++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 14+++ Python-2.7.3/setup.py 2014-07-16 16:06:37.145656284 +0000
13@@ -1634,8 +1634,10 @@ 15@@ -1639,10 +1639,12 @@
16 self.extensions.extend(exts)
17
14 # Call the method for detecting whether _tkinter can be compiled 18 # Call the method for detecting whether _tkinter can be compiled
15 self.detect_tkinter(inc_dirs, lib_dirs) 19- self.detect_tkinter(inc_dirs, lib_dirs)
20+ #self.detect_tkinter(inc_dirs, lib_dirs)
16 21
17- if '_tkinter' not in [e.name for e in self.extensions]: 22- if '_tkinter' not in [e.name for e in self.extensions]:
18- missing.append('_tkinter') 23- missing.append('_tkinter')