talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Xin LI 2020-04-09 05:11:18 +00:00
parent 6b5225e433
commit f5b7695d2d
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/mtree/BSD.usr.dist
View File

@ -1253,16 +1253,26 @@
.. ..
Australia Australia
.. ..
Brazil
..
Canada
..
Chile
..
Etc Etc
.. ..
Europe Europe
.. ..
Indian Indian
.. ..
Mexico
..
Pacific Pacific
.. ..
SystemV SystemV
.. ..
US
..
.. ..
.. ..
src nochange src nochange

2
share/mk/src.opts.mk
View File

@ -218,7 +218,6 @@ __DEFAULT_NO_OPTIONS = \
SORT_THREADS \ SORT_THREADS \
SVN \ SVN \
ZONEINFO_LEAPSECONDS_SUPPORT \ ZONEINFO_LEAPSECONDS_SUPPORT \
ZONEINFO_OLD_TIMEZONES_SUPPORT \
# LEFT/RIGHT. Left options which default to "yes" unless their corresponding # LEFT/RIGHT. Left options which default to "yes" unless their corresponding
# RIGHT option is disabled. # RIGHT option is disabled.
@ -466,7 +465,6 @@ MK_GOOGLETEST:= no
.if ${MK_ZONEINFO} == "no" .if ${MK_ZONEINFO} == "no"
MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
.endif .endif
.if ${MK_CROSS_COMPILER} == "no" .if ${MK_CROSS_COMPILER} == "no"

13
share/zoneinfo/Makefile
View File

@ -40,11 +40,6 @@ CONTRIBDIR= ${SRCTOP}/contrib/tzdata/
MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes
.endif .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" .if ${MK_ZONEINFO_LEAPSECONDS_SUPPORT} != "no"
LEAPFILE= -L ${CONTRIBDIR}leapseconds LEAPFILE= -L ${CONTRIBDIR}leapseconds
.else .else
@ -53,11 +48,8 @@ LEAPFILE=
TZFILES= africa antarctica asia australasia etcetera europe \ TZFILES= africa antarctica asia australasia etcetera europe \
factory northamerica southamerica factory northamerica southamerica
POSIXRULES= America/New_York
.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
TZFILES+= backward systemv TZFILES+= backward systemv
.endif POSIXRULES= America/New_York
TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/} TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/}
@ -78,10 +70,7 @@ TZBUILDSUBDIRS= \
Indian \ Indian \
Pacific \ Pacific \
SystemV SystemV
.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
.endif
.if !defined(_SKIP_BUILD) .if !defined(_SKIP_BUILD)
all: zoneinfo all: zoneinfo

2
share/zoneinfo/tests/Makefile
View File

@ -8,10 +8,8 @@ PACKAGE= tests
FILESGROUPS+= TESTFILES FILESGROUPS+= TESTFILES
.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
ATF_TESTS_SH+= backward_test ATF_TESTS_SH+= backward_test
TESTFILES+= backward TESTFILES+= backward
.endif
TESTFILES+= zoneinfo_common.sh TESTFILES+= zoneinfo_common.sh
TESTFILESPACKAGE= ${PACKAGE} TESTFILESPACKAGE= ${PACKAGE}