tcl: prefer tcl's own tzdata

The little thread that was "one of the tcl test cases fails with system
tzdata" has unravelled upstream into a series of problems with the tz
code when the system tzdata is used:

https://core.tcl-lang.org/tcl/tktview/51aa53616067cb63900b17ca1d71f07b094ffa1a

Add a PACKAGECONFIG for the option, and default to using the tcl tzdata
until the issues are resolved upstream.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/tcltk/tcl_9.0.3.bb b/meta/recipes-devtools/tcltk/tcl_9.0.3.bb
index 3c0a2572387c7c2e74cf58e2bc640d7004612084..18de3a333a2905520bfc32f1513ebb9be13fe4b9 100644 (file)
--- a/meta/recipes-devtools/tcltk/tcl_9.0.3.bb
+++ b/meta/recipes-devtools/tcltk/tcl_9.0.3.bb
@@ -38,11 +38,10 @@ EXTRA_AUTORECONF = "--exclude=aclocal"
 
 EXTRA_OECONF = "--disable-rpath --enable-man-suffix=tcl9 --disable-zipfs"
 
-# Prevent installing copy of tzdata based on tzdata installation on the build host
-# It doesn't install tzdata if one of the following files exist on the host:
-# /usr/share/zoneinfo/UTC /usr/share/zoneinfo/GMT /usr/share/lib/zoneinfo/UTC /usr/share/lib/zoneinfo/GMT /usr/lib/zoneinfo/UTC /usr/lib/zoneinfo/GMT
-# otherwise "/usr/lib/tcl8.6/tzdata" is included in tcl package
-EXTRA_OECONF += "--with-tzdata=no"
+PACKAGECONFIG ??= ""
+# Use of system tzdata is not recommended at present:
+# https://core.tcl-lang.org/tcl/tktview/51aa53616067cb63900b17ca1d71f07b094ffa1a
+PACKAGECONFIG[system-tzdata] = "--with-tzdata=no,--with-tzdata=yes,,tzdata"
 
 do_install() {
        autotools_do_install
@@ -69,7 +68,7 @@ FILES:${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh"
 
 # isn't getting picked up by shlibs code
 RDEPENDS:${PN} += "tcl-lib"
-RDEPENDS:${PN}-ptest += "libgcc locale-base-en-us tzdata"
+RDEPENDS:${PN}-ptest += "libgcc locale-base-en-us"
 
 BBCLASSEXTEND = "native nativesdk"