diff options
Diffstat (limited to 'poky/meta/recipes-devtools/python/python_2.7.15.bb')
| -rw-r--r-- | poky/meta/recipes-devtools/python/python_2.7.15.bb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/poky/meta/recipes-devtools/python/python_2.7.15.bb b/poky/meta/recipes-devtools/python/python_2.7.15.bb index c22c762d9..c459af06f 100644 --- a/poky/meta/recipes-devtools/python/python_2.7.15.bb +++ b/poky/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 \ @@ -33,6 +33,7 @@ SRC_URI += "\ file://float-endian.patch \ file://0001-closes-bpo-34540-Convert-shutil._call_external_zip-t.patch \ file://0001-2.7-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH.patch \ + file://0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch \ " S = "${WORKDIR}/Python-${PV}" @@ -41,10 +42,11 @@ inherit autotools multilib_header python-dir pythonnative ptest CONFIGUREOPTS += " --with-system-ffi " -EXTRA_OECONF += "ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no" +EXTRA_OECONF += "ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no ac_cv_working_tzset=yes" PACKAGECONFIG ??= "bdb" PACKAGECONFIG[bdb] = ",,db" +PACKAGECONFIG[tk] = ",,tk" do_configure_append() { rm -f ${S}/Makefile.orig @@ -129,6 +131,9 @@ do_install() { if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'bdb', d)}" ]; then rm -rf ${D}/${libdir}/python${PYTHON_MAJMIN}/bsddb fi + + # Python 3.x version of 2to3 is now the default + mv ${D}/${bindir}/2to3 ${D}/${bindir}/2to3-${PYTHON_MAJMIN} } do_install_append_class-nativesdk () { @@ -171,8 +176,8 @@ FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" RDEPENDS_${PN}-modules += "${PN}-misc" # ptest -RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip" - +RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip tzdata-europe coreutils" +RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '', d)}" # catch manpage PACKAGES += "${PN}-man" FILES_${PN}-man = "${datadir}/man" |
