mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
258cfa891e
* restore changes from: http://git.openembedded.org/openembedded-core/commit/?id=53ae544cfdac22c82af452b8c7ebe6664296bd9b * which were shamelessly removed in upgrade to 2.7.9: http://git.openembedded.org/openembedded-core/commit/?id=d4ad95f0d5f08891637c644e85b09da9c4585059 and then spread to python3 as well * fixes following issues reported by test-dependencies WARN: python3: python3-tkinter rdepends on glibc, but it isn't a build dependency? WARN: python3: python3-tkinter rdepends on libpython3, but it isn't a build dependency? WARN: python3: python3-tkinter rdepends on tcl-lib, but it isn't a build dependency? WARN: python: python-tkinter rdepends on glibc, but it isn't a build dependency? WARN: python: python-tkinter rdepends on libpython2, but it isn't a build dependency? WARN: python: python-tkinter rdepends on tcl-lib, but it isn't a build dependency? and following QA warnings in normal builds: python-2.7.11: python-tkinter rdepends on tcl-lib, but it isn't a build dependency, missing tcl in DEPENDS or PACKAGECONFIG? [build-deps] python-2.7.11: /usr/lib/python2.7/lib-dynload/_tkinter.so contained in package python-tkinter requires libtk8.6.so, but no providers found in RDEPENDS_python-tkinter? [file-rdeps] python3-3.5.1: python3-tkinter rdepends on tcl-lib, but it isn't a build dependency, missing tcl in DEPENDS or PACKAGECONFIG? [build-deps] python3-3.5.1: /usr/lib/python3.5/lib-dynload/_tkinter.cpython-35m-arm-linux-gnueabi.so contained in package python3-tkinter requires libtk8.6.so, but no providers found in RDEPENDS_python3-tkinter? [file-rdeps] (From OE-Core rev: 8cc5e36cd7978186d5ea1fe8af2f2bd6b3df8885) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
_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.
|
|
|
|
Upstream-Status: Inappropriate [distribution]
|
|
|
|
Also simply disable the tk module since its not in DEPENDS.
|
|
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
|
|
|
|
Index: Python-2.7.2/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 @@
|
|
# Call the method for detecting whether _tkinter can be compiled
|
|
self.detect_tkinter(inc_dirs, lib_dirs)
|
|
|
|
- if '_tkinter' not in [e.name for e in self.extensions]:
|
|
- missing.append('_tkinter')
|
|
+ # tkinter module will not be avalaible as yocto
|
|
+ # doesn't have tk integrated (yet)
|
|
+ #if '_tkinter' not in [e.name for e in self.extensions]:
|
|
+ # missing.append('_tkinter')
|
|
|
|
return missing
|
|
|
|
diff --git Python-3.5.1.orig/setup.py Python-3.5.1/setup.py
|
|
index b4633b9..d7588c0 100644
|
|
--- Python-3.5.1.orig/setup.py
|
|
+++ Python-3.5.1/setup.py
|
|
@@ -1536,7 +1536,7 @@ class PyBuildExt(build_ext):
|
|
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)
|
|
|
|
# tkinter module will not be avalaible as yocto
|
|
# doesn't have tk integrated (yet)
|