d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formalize LEAPSECONDS and OLDTIMEZONES in share/zoneinfo/... as

Browse Source 
`MK_ZONEINFO_LEAPSECONDS_SUPPORT == yes` and
`MK_ZONEINFO_OLD_TIMEZONES_SUPPORT == yes`.

Keep `LEAPSECONDS` and `OLDTIMEZONES` for backwards compatibility,
but print out a warning notifying users that they should use the new
variables, in an effort to migrate them to the variables. This is being
done mostly for automated build tools, etc, that might rely on these
variables being set. The variables will be removed in the future on
^/head, e.g., after ^/stable/12 is cut.

MFC after:      1 month
Relnotes:       yes
Reviewed by:	bdrewery
Differential Revision:	D11376
This commit is contained in:
Enji Cooper 2017-07-06 04:19:33 +00:00
parent 01df7d10a5
commit c5cba06079
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,6 +190,8 @@ __DEFAULT_NO_OPTIONS = \
SHARED_TOOLCHAIN \
SORT_THREADS \
SVN \
ZONEINFO_LEAPSECONDS_SUPPORT \
ZONEINFO_OLD_TIMEZONES_SUPPORT \
#
@ -387,6 +389,11 @@ MK_AUTHPF:= no
MK_DTRACE_TESTS:= no
.endif
.if ${MK_ZONEINFO} == "no"
MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
.endif
.if ${MK_CROSS_COMPILER} == "no"
MK_BINUTILS_BOOTSTRAP:= no
MK_CLANG_BOOTSTRAP:= no

16
share/zoneinfo/Makefile
View File

@ -28,12 +28,24 @@
# $ svn commit # Commit message: "MFV of tzdata2008X"
#
.include <src.opts.mk>
CLEANFILES+= yearistype
CLEANDIRS+= builddir
CONTRIBDIR= ${SRCTOP}/contrib/tzdata/
.PATH: ${CONTRIBDIR}
.if defined(LEAPSECONDS)
.warning "Using backwards compatibility variable for LEAPSECONDS; please use WITH_ZONEINFO_LEAPSECONDS_SUPPORT instead"
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
LEAPFILE=
@ -43,7 +55,7 @@ TZFILES= africa antarctica asia australasia etcetera europe \
factory northamerica southamerica
POSIXRULES= America/New_York
.if defined(OLDTIMEZONES)
.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
TZFILES+= backward systemv
.endif
@ -67,7 +79,7 @@ TZBUILDSUBDIRS= \
Pacific \
SystemV
.if defined(OLDTIMEZONES)
.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
.endif

2
tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT Normal file
View File

@ -0,0 +1,2 @@
.\" $FreeBSD$
Set to build leapsecond information in to the timezone database.

3
tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to build backward compatibility timezone aliases in to the timezone
database.