Page MenuHomeFreeBSD
Files F143373530

D11376.id30124.diff
No OneTemporary
Actions

D11376.id30124.diff
View Options

Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -190,6 +190,8 @@
SHARED_TOOLCHAIN \
SORT_THREADS \
SVN \
+ ZONEINFO_LEAPSECONDS_SUPPORT \
+ ZONEINFO_OLD_TIMEZONES_SUPPORT \
#
@@ -385,6 +387,11 @@
.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"
Index: share/zoneinfo/Makefile
===================================================================
--- share/zoneinfo/Makefile
+++ share/zoneinfo/Makefile
@@ -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 @@
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 @@
Pacific \
SystemV
-.if defined(OLDTIMEZONES)
+.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
.endif
Index: tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
===================================================================
--- tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
+++ tools/build/options/WITH_ZONEINFO_LEAPSECONDS_SUPPORT
@@ -1,2 +1,2 @@
-.\" $FreeBSD: head/tools/build/options/WITHOUT_ZONEINFO 235342 2012-05-12 16:12:36Z gjb $
-Set to not build the timezone database.
+.\" $FreeBSD: head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT 235342 2012-05-12 16:12:36Z gjb $
+Set to build leapsecond information in to the timezone database.
Index: tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
===================================================================
--- tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
+++ tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT
@@ -1,2 +1,3 @@
-.\" $FreeBSD: head/tools/build/options/WITHOUT_ZONEINFO 235342 2012-05-12 16:12:36Z gjb $
-Set to not build the timezone database.
+.\" $FreeBSD: head/tools/build/options/WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT 235342 2012-05-12 16:12:36Z gjb $
+Set to build backward compatibility timezone aliases in to the timezone
+database.

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 30, 2:01 PM (30 m, 53 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28101495
Default Alt Text
D11376.id30124.diff (2 KB)

Event Timeline