svn commit: r359736 - in head: etc/mtree share/mk share/zoneinfo share/zoneinfo/tests
Xin LI
delphij at FreeBSD.org
Thu Apr 9 05:11:20 UTC 2020
Author: delphij
Date: Thu Apr 9 05:11:18 2020
New Revision: 359736
URL: https://svnweb.freebsd.org/changeset/base/359736
Log:
Always install backward compatibility timezones, as they are installed
on all major Linux distributions as well as NetBSD and OpenBSD.
Remove the undocumented ZONEINFO_OLD_TIMEZONES_SUPPORT and the deprecated
OLDTIMEZONES knobs as they are now the default.
Reviewed by: ngie, rgrimes
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D24306
Modified:
head/etc/mtree/BSD.usr.dist
head/share/mk/src.opts.mk
head/share/zoneinfo/Makefile
head/share/zoneinfo/tests/Makefile
Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist Thu Apr 9 04:50:19 2020 (r359735)
+++ head/etc/mtree/BSD.usr.dist Thu Apr 9 05:11:18 2020 (r359736)
@@ -1253,15 +1253,25 @@
..
Australia
..
+ Brazil
+ ..
+ Canada
+ ..
+ Chile
+ ..
Etc
..
Europe
..
Indian
..
+ Mexico
+ ..
Pacific
..
SystemV
+ ..
+ US
..
..
..
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Thu Apr 9 04:50:19 2020 (r359735)
+++ head/share/mk/src.opts.mk Thu Apr 9 05:11:18 2020 (r359736)
@@ -218,7 +218,6 @@ __DEFAULT_NO_OPTIONS = \
SORT_THREADS \
SVN \
ZONEINFO_LEAPSECONDS_SUPPORT \
- ZONEINFO_OLD_TIMEZONES_SUPPORT \
# LEFT/RIGHT. Left options which default to "yes" unless their corresponding
# RIGHT option is disabled.
@@ -466,7 +465,6 @@ MK_GOOGLETEST:= no
.if ${MK_ZONEINFO} == "no"
MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
-MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
.endif
.if ${MK_CROSS_COMPILER} == "no"
Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile Thu Apr 9 04:50:19 2020 (r359735)
+++ head/share/zoneinfo/Makefile Thu Apr 9 05:11:18 2020 (r359736)
@@ -40,11 +40,6 @@ CONTRIBDIR= ${SRCTOP}/contrib/tzdata/
MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes
.endif
-.if defined(OLDTIMEZONES)
-.warning "Using backwards compatibility variable for OLDTIMEZONES; please use WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT instead"
-MK_ZONEINFO_OLD_TIMEZONES_SUPPORT= yes
-.endif
-
.if ${MK_ZONEINFO_LEAPSECONDS_SUPPORT} != "no"
LEAPFILE= -L ${CONTRIBDIR}leapseconds
.else
@@ -53,12 +48,9 @@ LEAPFILE=
TZFILES= africa antarctica asia australasia etcetera europe \
factory northamerica southamerica
+TZFILES+= backward systemv
POSIXRULES= America/New_York
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
-TZFILES+= backward systemv
-.endif
-
TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/}
TZBUILDDIR= ${.OBJDIR}/builddir
@@ -78,10 +70,7 @@ TZBUILDSUBDIRS= \
Indian \
Pacific \
SystemV
-
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
-.endif
.if !defined(_SKIP_BUILD)
all: zoneinfo
Modified: head/share/zoneinfo/tests/Makefile
==============================================================================
--- head/share/zoneinfo/tests/Makefile Thu Apr 9 04:50:19 2020 (r359735)
+++ head/share/zoneinfo/tests/Makefile Thu Apr 9 05:11:18 2020 (r359736)
@@ -8,10 +8,8 @@ PACKAGE= tests
FILESGROUPS+= TESTFILES
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
ATF_TESTS_SH+= backward_test
TESTFILES+= backward
-.endif
TESTFILES+= zoneinfo_common.sh
TESTFILESPACKAGE= ${PACKAGE}
More information about the svn-src-all
mailing list