From owner-svn-src-head@freebsd.org Thu Jul 6 04:19:35 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46BA6D9D8DF; Thu, 6 Jul 2017 04:19:35 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2246E7EE33; Thu, 6 Jul 2017 04:19:35 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v664JYXW085382; Thu, 6 Jul 2017 04:19:34 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v664JXg7085378; Thu, 6 Jul 2017 04:19:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201707060419.v664JXg7085378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 6 Jul 2017 04:19:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320702 - in head: share/mk share/zoneinfo tools/build/options X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in head: share/mk share/zoneinfo tools/build/options X-SVN-Commit-Revision: 320702 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2017 04:19:35 -0000 Author: ngie Date: Thu Jul 6 04:19:33 2017 New Revision: 320702 URL: https://svnweb.freebsd.org/changeset/base/320702 Log: 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. MFC after: 1 month Relnotes: yes Reviewed by: bdrewery Differential Revision: D11376 Added: head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT (contents, props changed) - copied, changed from r320396, head/tools/build/options/WITHOUT_ZONEINFO head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT (contents, props changed) - copied, changed from r320396, head/tools/build/options/WITHOUT_ZONEINFO Modified: head/share/mk/src.opts.mk head/share/zoneinfo/Makefile Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Thu Jul 6 04:15:30 2017 (r320701) +++ head/share/mk/src.opts.mk Thu Jul 6 04:19:33 2017 (r320702) @@ -190,6 +190,8 @@ __DEFAULT_NO_OPTIONS = \ SHARED_TOOLCHAIN \ SORT_THREADS \ SVN \ + ZONEINFO_LEAPSECONDS_SUPPORT \ + ZONEINFO_OLD_TIMEZONES_SUPPORT \ # @@ -385,6 +387,11 @@ MK_AUTHPF:= no .if ${MK_TESTS} == "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" Modified: head/share/zoneinfo/Makefile ============================================================================== --- head/share/zoneinfo/Makefile Thu Jul 6 04:15:30 2017 (r320701) +++ head/share/zoneinfo/Makefile Thu Jul 6 04:19:33 2017 (r320702) @@ -28,12 +28,24 @@ # $ svn commit # Commit message: "MFV of tzdata2008X" # +.include + 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 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 Copied and modified: head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT (from r320396, head/tools/build/options/WITHOUT_ZONEINFO) ============================================================================== --- head/tools/build/options/WITHOUT_ZONEINFO Tue Jun 27 06:02:50 2017 (r320396, copy source) +++ head/tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT Thu Jul 6 04:19:33 2017 (r320702) @@ -1,2 +1,2 @@ .\" $FreeBSD$ -Set to not build the timezone database. +Set to build leapsecond information in to the timezone database. Copied and modified: head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT (from r320396, head/tools/build/options/WITHOUT_ZONEINFO) ============================================================================== --- head/tools/build/options/WITHOUT_ZONEINFO Tue Jun 27 06:02:50 2017 (r320396, copy source) +++ head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT Thu Jul 6 04:19:33 2017 (r320702) @@ -1,2 +1,3 @@ .\" $FreeBSD$ -Set to not build the timezone database. +Set to build backward compatibility timezone aliases in to the timezone +database.