diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-01-17 11:47:11 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-01-17 14:15:13 +0000 |
| commit | d74d84c623ea8ae394b28c26e6a9a946ff126c31 (patch) | |
| tree | 3e9b1ce1af1845aef6bd2c72fcef3d7af8a21781 | |
| parent | 3a121c06f3cff8206883dea526bec4569876b059 (diff) | |
| download | gcc-d74d84c623ea8ae394b28c26e6a9a946ff126c31.zip gcc-d74d84c623ea8ae394b28c26e6a9a946ff126c31.tar.gz gcc-d74d84c623ea8ae394b28c26e6a9a946ff126c31.tar.bz2 | |
libstdc++: Fix configuration of default zoneinfo dir on linux
The config for --with-libstdcxx-zoneinfo=yes was comparing the target
triplet to "gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu" which is only
the last component of the triplet, so failed to match and always used
the zoneinfo_dir=none default. Check $target_os instead.
There was also an error in the check for native builds that tzdata.zi is
actually present in the configured directory. That meant a warning was
printed even when the file was present:
configure: zoneinfo data directory: /usr/share/zoneinfo
configure: WARNING: "/usr/share/zoneinfo does not contain tzdata.zi file"
configure: static tzdata.zi file will be compiled into the library
libstdc++-v3/ChangeLog:
* acinclude.m4 (GLIBCXX_ZONEINFO_DIR): Check $target_os instead
of $host. Fix check for file being present during native build.
* configure: Regenerate.
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 8 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index b1608ae..982e979 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -5180,17 +5180,17 @@ AC_DEFUN([GLIBCXX_ZONEINFO_DIR], [ if test "x${with_libstdcxx_zoneinfo}" = xyes; then # Pick a default when no specific path is set. - case "$host" in + case "$target_os" in gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) # Not all distros ship tzdata.zi in this dir. zoneinfo_dir="/usr/share/zoneinfo" ;; - *-*-aix*) + aix*) # Binary tzfile files are in /usr/share/lib/zoneinfo # but tzdata.zi is not present there. zoneinfo_dir=none ;; - *-*-darwin2*) + darwin2*) # Binary tzfile files are in /usr/share/lib/zoneinfo.default # but tzdata.zi is not present there. zoneinfo_dir=none @@ -5230,7 +5230,7 @@ AC_DEFUN([GLIBCXX_ZONEINFO_DIR], [ if test "x${zoneinfo_dir}" != xnone; then AC_DEFINE_UNQUOTED(_GLIBCXX_ZONEINFO_DIR, "${zoneinfo_dir}", [Define if a directory should be searched for tzdata files.]) - if $GLIBCXX_IS_NATIVE -a ! test -f "$zoneinfo_dir/tzdata.zi"; then + if $GLIBCXX_IS_NATIVE && ! test -f "$zoneinfo_dir/tzdata.zi"; then AC_MSG_WARN("$zoneinfo_dir does not contain tzdata.zi file") fi fi diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 9c0f3a3..a298cbd 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -71536,17 +71536,17 @@ fi if test "x${with_libstdcxx_zoneinfo}" = xyes; then # Pick a default when no specific path is set. - case "$host" in + case "$target_os" in gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) # Not all distros ship tzdata.zi in this dir. zoneinfo_dir="/usr/share/zoneinfo" ;; - *-*-aix*) + aix*) # Binary tzfile files are in /usr/share/lib/zoneinfo # but tzdata.zi is not present there. zoneinfo_dir=none ;; - *-*-darwin2*) + darwin2*) # Binary tzfile files are in /usr/share/lib/zoneinfo.default # but tzdata.zi is not present there. zoneinfo_dir=none @@ -71590,7 +71590,7 @@ cat >>confdefs.h <<_ACEOF #define _GLIBCXX_ZONEINFO_DIR "${zoneinfo_dir}" _ACEOF - if $GLIBCXX_IS_NATIVE -a ! test -f "$zoneinfo_dir/tzdata.zi"; then + if $GLIBCXX_IS_NATIVE && ! test -f "$zoneinfo_dir/tzdata.zi"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"$zoneinfo_dir does not contain tzdata.zi file\"" >&5 $as_echo "$as_me: WARNING: \"$zoneinfo_dir does not contain tzdata.zi file\"" >&2;} fi |