zoneinfo: On amd64, include 32-bit data.
While there, drop the unnecessary posixrules option. Sponsored by: Klara, Inc. Reviewed by: imp, allanjude Differential Revision: https://reviews.freebsd.org/D38142
This commit is contained in:
parent
4410e85796
commit
783c318fd1
@ -51,7 +51,6 @@ LEAPFILE=
|
|||||||
TZFILES= africa antarctica asia australasia etcetera europe \
|
TZFILES= africa antarctica asia australasia etcetera europe \
|
||||||
factory northamerica southamerica
|
factory northamerica southamerica
|
||||||
TZFILES+= backward
|
TZFILES+= backward
|
||||||
POSIXRULES= America/New_York
|
|
||||||
|
|
||||||
TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/}
|
TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/}
|
||||||
|
|
||||||
@ -78,11 +77,17 @@ all: zoneinfo
|
|||||||
.endif
|
.endif
|
||||||
META_TARGETS+= zoneinfo install-zoneinfo
|
META_TARGETS+= zoneinfo install-zoneinfo
|
||||||
|
|
||||||
|
# On amd64, include 32-bit data for compatibility with statically-linked
|
||||||
|
# i386 binaries which still use a 32-bit time_t.
|
||||||
|
.if ${MACHINE_ARCH} == "amd64"
|
||||||
|
ZICFLAGS+= -b fat
|
||||||
|
.endif
|
||||||
|
|
||||||
zoneinfo: ${TDATA}
|
zoneinfo: ${TDATA}
|
||||||
mkdir -p ${TZBUILDDIR}
|
mkdir -p ${TZBUILDDIR}
|
||||||
cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS}
|
cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS}
|
||||||
umask 022; cd ${.CURDIR}; \
|
umask 022; cd ${.CURDIR}; \
|
||||||
zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \
|
zic -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \
|
||||||
${LEAPFILE} ${TZFILES}
|
${LEAPFILE} ${TZFILES}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user