Date: Sat, 5 Aug 2017 16:44:31 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r322099 - in stable/11: etc/mtree share/mk share/zoneinfo share/zoneinfo/tests tools/build/options Message-ID: <201708051644.v75GiVFE017061@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Aug 5 16:44:31 2017 New Revision: 322099 URL: https://svnweb.freebsd.org/changeset/base/322099 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/11/share/zoneinfo/tests/ - copied from r320703, head/share/zoneinfo/tests/ stable/11/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT - copied unchanged from r320702, head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT stable/11/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT - copied unchanged from r320702, head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT Modified: stable/11/etc/mtree/BSD.tests.dist stable/11/share/mk/src.opts.mk stable/11/share/zoneinfo/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/mtree/BSD.tests.dist ============================================================================== --- stable/11/etc/mtree/BSD.tests.dist Sat Aug 5 14:49:40 2017 (r322098) +++ stable/11/etc/mtree/BSD.tests.dist Sat Aug 5 16:44:31 2017 (r322099) @@ -388,6 +388,8 @@ .. .. .. + zoneinfo + .. .. sys acl Modified: stable/11/share/mk/src.opts.mk ============================================================================== --- stable/11/share/mk/src.opts.mk Sat Aug 5 14:49:40 2017 (r322098) +++ stable/11/share/mk/src.opts.mk Sat Aug 5 16:44:31 2017 (r322099) @@ -194,6 +194,8 @@ __DEFAULT_NO_OPTIONS = \ SHARED_TOOLCHAIN \ SORT_THREADS \ SVN \ + ZONEINFO_LEAPSECONDS_SUPPORT \ + ZONEINFO_OLD_TIMEZONES_SUPPORT \ # @@ -371,6 +373,11 @@ MK_DTRACE_TESTS:= no .if ${MK_TEXTPROC} == "no" MK_GROFF:= no +.endif + +.if ${MK_ZONEINFO} == "no" +MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no +MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no .endif .if ${MK_CROSS_COMPILER} == "no" Modified: stable/11/share/zoneinfo/Makefile ============================================================================== --- stable/11/share/zoneinfo/Makefile Sat Aug 5 14:49:40 2017 (r322098) +++ stable/11/share/zoneinfo/Makefile Sat Aug 5 16:44:31 2017 (r322099) @@ -28,12 +28,24 @@ # $ svn commit # Commit message: "MFV of tzdata2008X" # +.include <src.opts.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 @@ -113,5 +125,9 @@ afterinstall: else \ echo "Run tzsetup(8) manually to update /etc/localtime."; \ fi + +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include <bsd.prog.mk> Copied: stable/11/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/11/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT Sat Aug 5 16:44:31 2017 (r322099, 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/11/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/11/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT Sat Aug 5 16:44:31 2017 (r322099, 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708051644.v75GiVFE017061>