mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libstdc++: Fix configuration of default zoneinfo dir on linux

Browse Source 
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.
This commit is contained in:
Jonathan Wakely 2023-01-17 11:47:11 +00:00
parent 3a121c06f3
commit d74d84c623
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/acinclude.m4
View File

@ -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

8
libstdc++-v3/configure vendored
View File

@ -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