diff options
| -rw-r--r-- | meta/recipes-devtools/python/python/python2-manifest.json | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python_2.7.15.bb | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json index 260fa6f80d..a9f392475c 100644 --- a/meta/recipes-devtools/python/python/python2-manifest.json +++ b/meta/recipes-devtools/python/python/python2-manifest.json @@ -966,6 +966,7 @@ "core" ], "files": [ + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.so", "${libdir}/python2.7/lib-tk" ] }, @@ -1043,4 +1044,4 @@ "${libdir}/python2.7/lib-dynload/zlib.so" ] } -}
\ No newline at end of file +} diff --git a/meta/recipes-devtools/python/python_2.7.15.bb b/meta/recipes-devtools/python/python_2.7.15.bb index dd969d8e7e..6a60aa7f5b 100644 --- a/meta/recipes-devtools/python/python_2.7.15.bb +++ b/meta/recipes-devtools/python/python_2.7.15.bb @@ -21,7 +21,7 @@ SRC_URI += "\ file://setuptweaks.patch \ file://check-if-target-is-64b-not-host.patch \ file://search_db_h_in_inc_dirs_and_avoid_warning.patch \ - file://avoid_warning_about_tkinter.patch \ + ${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \ file://avoid_warning_for_sunos_specific_module.patch \ file://python-2.7.3-remove-bsdb-rpath.patch \ file://run-ptest \ @@ -45,6 +45,7 @@ EXTRA_OECONF += "ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no" PACKAGECONFIG ??= "bdb" PACKAGECONFIG[bdb] = ",,db" +PACKAGECONFIG[tk] = ",,tk" do_configure_append() { rm -f ${S}/Makefile.orig @@ -172,7 +173,7 @@ RDEPENDS_${PN}-modules += "${PN}-misc" # ptest RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip" - +RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '', d)}" # catch manpage PACKAGES += "${PN}-man" FILES_${PN}-man = "${datadir}/man" |