diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-08-17 15:46:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-21 11:34:12 +0100 |
commit | d9a71a83d308f2a2bd291323cd1fa4c3aa9fe7b9 (patch) | |
tree | 43e210df76fa8517798f4c0dc42eb02afaf14168 /meta/recipes-devtools/tcltk/tcl_8.6.13.bb | |
parent | 8f98a81394312bc7d25503e91a1e4af1fa7767ff (diff) | |
download | poky-d9a71a83d308f2a2bd291323cd1fa4c3aa9fe7b9.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: 3ace9fbfeb42ebf920812e3dd6d665b8b20a1ca0)
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>
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl_8.6.13.bb')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.13.bb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.13.bb b/meta/recipes-devtools/tcltk/tcl_8.6.13.bb index 91fc81352e..9eb924b0da 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.13.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.13.bb | |||
@@ -41,6 +41,12 @@ inherit autotools ptest binconfig | |||
41 | AUTOTOOLS_SCRIPT_PATH = "${S}/unix" | 41 | AUTOTOOLS_SCRIPT_PATH = "${S}/unix" |
42 | EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix" | 42 | EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix" |
43 | 43 | ||
44 | # Prevent installing copy of tzdata based on tzdata installation on the build host | ||
45 | # It doesn't install tzdata if one of the following files exist on the host: | ||
46 | # /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 | ||
47 | # otherwise "/usr/lib/tcl8.6/tzdata" is included in tcl package | ||
48 | EXTRA_OECONF += "--with-tzdata=no" | ||
49 | |||
44 | do_install() { | 50 | do_install() { |
45 | autotools_do_install | 51 | autotools_do_install |
46 | oe_runmake 'DESTDIR=${D}' install-private-headers | 52 | oe_runmake 'DESTDIR=${D}' install-private-headers |