Author: ngie
Date: Sat Aug 5 16:55:07 2017
New Revision: 322100
URL: https://svnweb.freebsd.org/changeset/base/322100
Log:
MFC r320702,r320703:
r320702:
Formalize LEAPSECONDS and OLDTIMEZONES in share/zoneinfo/... as
`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.
Relnotes: yes
r320703:
Add tests to help verify Links functionality for .../contrib/tzdata/backwards
MFC with: r320702
Added:
stable/10/share/zoneinfo/tests/
- copied from r320703, head/share/zoneinfo/tests/
stable/10/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
- copied unchanged from r320702,
head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
stable/10/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
- copied unchanged from r320702,
head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
Modified:
stable/10/etc/mtree/BSD.tests.dist
stable/10/share/mk/bsd.own.mk
stable/10/share/zoneinfo/Makefile
stable/10/share/zoneinfo/tests/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist Sat Aug 5 16:44:31 2017
(r322099)
+++ stable/10/etc/mtree/BSD.tests.dist Sat Aug 5 16:55:07 2017
(r322100)
@@ -374,6 +374,8 @@
..
..
..
+ zoneinfo
+ ..
..
sys
acl
Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk Sat Aug 5 16:44:31 2017
(r322099)
+++ stable/10/share/mk/bsd.own.mk Sat Aug 5 16:55:07 2017
(r322100)
@@ -411,8 +411,11 @@ __DEFAULT_NO_OPTIONS = \
SHARED_TOOLCHAIN \
SVN \
TESTS \
- USB_GADGET_EXAMPLES
+ USB_GADGET_EXAMPLES \
+ ZONEINFO_LEAPSECONDS_SUPPORT \
+ ZONEINFO_OLD_TIMEZONES_SUPPORT \
+
#
# Default behaviour of some options depends on the architecture. Unfortunately
# this means that we have to test TARGET_ARCH (the buildworld case) as well
@@ -584,6 +587,11 @@ MK_BINUTILS:= no
MK_CLANG:= no
MK_GCC:= no
MK_GDB:= no
+.endif
+
+.if ${MK_ZONEINFO} == "no"
+MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
+MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
.endif
.if ${MK_CLANG} == "no"
Modified: stable/10/share/zoneinfo/Makefile
==============================================================================
--- stable/10/share/zoneinfo/Makefile Sat Aug 5 16:44:31 2017
(r322099)
+++ stable/10/share/zoneinfo/Makefile Sat Aug 5 16:55:07 2017
(r322100)
@@ -28,12 +28,24 @@
# $ svn update # Commit message: "MFV of tzdata2008X"
#
+.include <bsd.own.mk>
+
CLEANFILES+= yearistype
CLEANDIRS+= builddir
CONTRIBDIR= ${.CURDIR}/../../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 e
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
@@ -110,5 +122,9 @@ afterinstall:
else \
echo "Run tzsetup(8) manually to update /etc/localtime."; \
fi
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
.include <bsd.prog.mk>
Modified: stable/10/share/zoneinfo/tests/Makefile
==============================================================================
--- head/share/zoneinfo/tests/Makefile Thu Jul 6 04:30:06 2017
(r320703)
+++ stable/10/share/zoneinfo/tests/Makefile Sat Aug 5 16:55:07 2017
(r322100)
@@ -1,11 +1,10 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.own.mk>
.PATH: ${SRCTOP}/contrib/tzdata
-PACKAGE= tests
-
+FILESGROUPS= FILES
FILESGROUPS+= TESTFILES
.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
@@ -14,7 +13,6 @@ TESTFILES+= backward
.endif
TESTFILES+= zoneinfo_common.sh
-TESTFILESPACKAGE= ${PACKAGE}
TESTFILESDIR= ${TESTSDIR}
.include <bsd.test.mk>
Copied: stable/10/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT (from
r320702, head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT Sat Aug
5 16:55:07 2017 (r322100, copy of r320702,
head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build leapsecond information in to the timezone database.
Copied: stable/10/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT (from
r320702, head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT Sat Aug
5 16:55:07 2017 (r322100, copy of r320702,
head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to build backward compatibility timezone aliases in to the timezone
+database.
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
