diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-09-13 16:41:32 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-09-23 05:26:16 -1000 |
| commit | 989673a26f1538233365b4dee0534a6f4964f6bc (patch) | |
| tree | 4b8436f177cd79d2399434dd713adc9890bd0cd1 /meta | |
| parent | d95804e5843525cde59846c8714b853e21534a65 (diff) | |
| download | poky-989673a26f1538233365b4dee0534a6f4964f6bc.tar.gz | |
tcl: prevent installing another copy of tzdata
It checks build host filesystem and if it doesn't find UTC or GMT
files it installs another copy of tzdata files in:
/usr/lib/tcl8.6/tzdata
Buildhistory shows the difference:
-PKGSIZE = 2227075
+PKGSIZE = 3433088
See the autodetection in configure.in:
#------------------------------------------------------------------------
# Check whether the timezone data is supplied by the OS or has
# to be installed by Tcl. The default is autodetection, but can
# be overridden on the configure command line either way.
#------------------------------------------------------------------------
AC_MSG_CHECKING([for timezone data])
AC_ARG_WITH(tzdata,
AC_HELP_STRING([--with-tzdata],
[install timezone data (default: autodetect)]),
[tcl_ok=$withval], [tcl_ok=auto])
#
# Any directories that get added here must also be added to the
# search path in ::tcl::clock::Initialize (library/clock.tcl).
#
case $tcl_ok in
no)
AC_MSG_RESULT([supplied by OS vendor])
;;
yes)
# nothing to do here
;;
auto*)
AC_CACHE_VAL([tcl_cv_dir_zoneinfo], [
for dir in /usr/share/zoneinfo \
/usr/share/lib/zoneinfo \
/usr/lib/zoneinfo
do
if test -f $dir/UTC -o -f $dir/GMT
then
tcl_cv_dir_zoneinfo="$dir"
break
fi
done])
if test -n "$tcl_cv_dir_zoneinfo"; then
tcl_ok=no
AC_MSG_RESULT([$dir])
else
tcl_ok=yes
fi
;;
*)
AC_MSG_ERROR([invalid argument: $tcl_ok])
;;
esac
if test $tcl_ok = yes
then
AC_MSG_RESULT([supplied by Tcl])
INSTALL_TZDATA=install-tzdata
fi
(From OE-Core rev: 79498ea0e9eb88ad0175f7376c57efb46217a4a4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3ace9fbfeb42ebf920812e3dd6d665b8b20a1ca0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb index 9f6b003ffb..b591671868 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb | |||
| @@ -44,6 +44,12 @@ inherit autotools ptest binconfig | |||
| 44 | AUTOTOOLS_SCRIPT_PATH = "${S}/unix" | 44 | AUTOTOOLS_SCRIPT_PATH = "${S}/unix" |
| 45 | EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix" | 45 | EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix" |
| 46 | 46 | ||
| 47 | # Prevent installing copy of tzdata based on tzdata installation on the build host | ||
| 48 | # It doesn't install tzdata if one of the following files exist on the host: | ||
| 49 | # /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 | ||
| 50 | # otherwise "/usr/lib/tcl8.6/tzdata" is included in tcl package | ||
| 51 | EXTRA_OECONF += "--with-tzdata=no" | ||
| 52 | |||
| 47 | do_install() { | 53 | do_install() { |
| 48 | autotools_do_install | 54 | autotools_do_install |
| 49 | oe_runmake 'DESTDIR=${D}' install-private-headers | 55 | oe_runmake 'DESTDIR=${D}' install-private-headers |
