git: 91506dba7f2e - main - zoneinfo: also install tzdata.zi and version
Date: Tue, 01 Apr 2025 08:10:09 UTC
The branch main has been updated by philip:
URL: https://cgit.FreeBSD.org/src/commit/?id=91506dba7f2eb147eeb55ec30640bc11755a1e8e
commit 91506dba7f2eb147eeb55ec30640bc11755a1e8e
Author: Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2025-04-01 08:09:37 +0000
Commit: Philip Paeps <philip@FreeBSD.org>
CommitDate: 2025-04-01 08:09:37 +0000
zoneinfo: also install tzdata.zi and version
Build and install the shrunk version of the time zone database required
by libc++ 19 std::chrono::current_zone (etc). While here, also install
the tzdata 'version' file to align more closely with other vendors.
PR: 282377
Reviewed by: dim, emaste, imp
Differential Revision: https://reviews.freebsd.org/D49577
---
share/zoneinfo/Makefile | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 824dda827e44..e3111c915a93 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -98,6 +98,20 @@ zonefiles: ${TDATA}
(umask 022; cd ${.CURDIR}; \
${ZIC:Uzic} -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \
${LEAPFILE} ${TZFILES})
+ (umask 022; cd ${TZBUILDDIR}; \
+ read -r version <${CONTRIBDIR}version && \
+ LC_ALL=C awk \
+ -v DATAFORM='main' \
+ -v PACKRATDATA='' \
+ -v PACKRATLIST='' \
+ -f ${CONTRIBDIR}ziguard.awk ${TZFILES} >${TZBUILDDIR}/main.zi; \
+ LC_ALL=C awk \
+ -v dataform='main' \
+ -v deps='zishrink.awk' \
+ -v redo='posix_only' \
+ -v version="$$version" \
+ -f ${CONTRIBDIR}zishrink.awk \
+ main.zi >tzdata.zi; rm main.zi)
(cd ${TZBUILDDIR} && find * -type f | LC_ALL=C sort) > ${.TARGET}
beforeinstall: install-zoneinfo
@@ -113,6 +127,8 @@ install-zoneinfo:
${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${CONTRIBDIR}/zone1970.tab ${DESTDIR}/usr/share/zoneinfo/
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+ ${CONTRIBDIR}/version ${DESTDIR}/usr/share/zoneinfo/
afterinstall:
#