summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2018-11-14 17:36:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-23 23:35:19 +0000
commit75d2d6776b434e998c0ad7ef531ce179d1595e7d (patch)
tree88031e6788c06a032cf79b6d7981e5578983cd8a
parenta596919132b10dab348bd33352b02f5e21bb0499 (diff)
downloadpoky-75d2d6776b434e998c0ad7ef531ce179d1595e7d.tar.gz
python3: add tk support
Add support to enable tk via PACKAGECONFIG. before this patch: # python3 Python 3.5.6 (default, Nov 8 2018, 04:53:45) [GCC 8.2.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> import tkinter Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib64/python3.5/tkinter/__init__.py", line 35, in <module> import _tkinter # If this fails your Python may not be configured for Tk ImportError: No module named '_tkinter' >>> After this patch, if enable tk in PACKAGECONFIG, then # python3 Python 3.5.6 (default, Nov 8 2018, 03:15:52) [GCC 8.2.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> import tkinter >>> (From OE-Core rev: 4b781d545e7e0b084201cd6a8fad953b0f231513) Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3-native_3.5.6.bb3
-rw-r--r--meta/recipes-devtools/python/python3/python3-manifest.json1
-rw-r--r--meta/recipes-devtools/python/python3_3.5.6.bb5
3 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/python3-native_3.5.6.bb b/meta/recipes-devtools/python/python3-native_3.5.6.bb
index d5953cf4bb..1e98c036c3 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.6.bb
@@ -12,7 +12,7 @@ file://130-readline-setup.patch \
12file://150-fix-setupterm.patch \ 12file://150-fix-setupterm.patch \
13file://python-3.3-multilib.patch \ 13file://python-3.3-multilib.patch \
14file://03-fix-tkinter-detection.patch \ 14file://03-fix-tkinter-detection.patch \
15file://avoid_warning_about_tkinter.patch \ 15${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \
16file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ 16file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
17file://sysroot-include-headers.patch \ 17file://sysroot-include-headers.patch \
18file://unixccompiler.patch \ 18file://unixccompiler.patch \
@@ -28,6 +28,7 @@ file://0003-bpo-32947-Fixes-for-TLS-1.3-and-OpenSSL-1.1.1-GH-876.patch \
28file://0004-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976.patch \ 28file://0004-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976.patch \
29file://0005-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-2305.patch \ 29file://0005-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-2305.patch \
30" 30"
31PACKAGECONFIG[tk] = ",,tk-native"
31 32
32EXTRANATIVEPATH += "bzip2-native" 33EXTRANATIVEPATH += "bzip2-native"
33DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native sqlite3-native gdbm-native" 34DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native sqlite3-native gdbm-native"
diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json
index 5329bf7c57..617256a3e0 100644
--- a/meta/recipes-devtools/python/python3/python3-manifest.json
+++ b/meta/recipes-devtools/python/python3/python3-manifest.json
@@ -1060,6 +1060,7 @@
1060 "core" 1060 "core"
1061 ], 1061 ],
1062 "files": [ 1062 "files": [
1063 "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.*.so",
1063 "${libdir}/python${PYTHON_MAJMIN}/tkinter" 1064 "${libdir}/python${PYTHON_MAJMIN}/tkinter"
1064 ], 1065 ],
1065 "cached": [] 1066 "cached": []
diff --git a/meta/recipes-devtools/python/python3_3.5.6.bb b/meta/recipes-devtools/python/python3_3.5.6.bb
index 5408e3f9fc..25c47b6192 100644
--- a/meta/recipes-devtools/python/python3_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3_3.5.6.bb
@@ -21,7 +21,7 @@ ${DISTRO_SRC_URI} \
21 21
22SRC_URI += "\ 22SRC_URI += "\
23 file://03-fix-tkinter-detection.patch \ 23 file://03-fix-tkinter-detection.patch \
24 file://avoid_warning_about_tkinter.patch \ 24 ${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \
25 file://cgi_py.patch \ 25 file://cgi_py.patch \
26 file://host_include_contamination.patch \ 26 file://host_include_contamination.patch \
27 file://python-3.3-multilib.patch \ 27 file://python-3.3-multilib.patch \
@@ -82,6 +82,7 @@ PACKAGECONFIG ??= "readline ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-userm
82PACKAGECONFIG[readline] = ",,readline" 82PACKAGECONFIG[readline] = ",,readline"
83# Use profile guided optimisation by running PyBench inside qemu-user 83# Use profile guided optimisation by running PyBench inside qemu-user
84PACKAGECONFIG[pgo] = "--enable-optimizations" 84PACKAGECONFIG[pgo] = "--enable-optimizations"
85PACKAGECONFIG[tk] = ",,tk"
85 86
86do_configure_append() { 87do_configure_append() {
87 rm -f ${S}/Makefile.orig 88 rm -f ${S}/Makefile.orig
@@ -246,7 +247,7 @@ PACKAGES += "${PN}-man"
246FILES_${PN}-man = "${datadir}/man" 247FILES_${PN}-man = "${datadir}/man"
247 248
248RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2" 249RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2"
249 250RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '', d)}"
250RDEPENDS_${PN}-dev = "" 251RDEPENDS_${PN}-dev = ""
251 252
252BBCLASSEXTEND = "nativesdk" 253BBCLASSEXTEND = "nativesdk"