Patchwork [19/19] python: Forcibly disable tk

login
register
mail settings
Submitter Richard Purdie
Date July 16, 2014, 4:26 p.m.
Message ID <6277921e6514c3cde70b2b8cf0d747f197a97941.1405527926.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/75777/
State Accepted
Commit d418bedca5ec8b897d0309c6ff7d56b3fd071822
Headers show

Comments

Richard Purdie - July 16, 2014, 4:26 p.m.
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

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python/python/avoid_warning_about_tkinter.patch       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Patch

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 208c57c..bedc390 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
 in yocto so we skip the check for this module.
 Avoid a warning by not adding this module to missing variable.
 
+Also simply disable the tk module since its not in DEPENDS.
+
 Upstream-Status: Inappropriate [distribution]
 
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
 
-Index: Python-2.7.2/setup.py
+Index: Python-2.7.3/setup.py
 ===================================================================
---- Python-2.7.2.orig/setup.py	2012-04-05 23:18:38.500136647 +0300
-+++ Python-2.7.2/setup.py	2012-04-05 23:19:35.888134969 +0300
-@@ -1634,8 +1634,10 @@
+--- Python-2.7.3.orig/setup.py	2014-07-07 13:45:15.056233820 +0000
++++ Python-2.7.3/setup.py	2014-07-16 16:06:37.145656284 +0000
+@@ -1639,10 +1639,12 @@
+         self.extensions.extend(exts)
+ 
          # Call the method for detecting whether _tkinter can be compiled
-         self.detect_tkinter(inc_dirs, lib_dirs)
+-        self.detect_tkinter(inc_dirs, lib_dirs)
++        #self.detect_tkinter(inc_dirs, lib_dirs)
  
 -        if '_tkinter' not in [e.name for e in self.extensions]:
 -            missing.append('_tkinter')