git: 3502f06c6686 - stable/13 - zoneinfo: also install tzdata.zi and version
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 06 May 2025 04:58:43 UTC
The branch stable/13 has been updated by philip:
URL: https://cgit.FreeBSD.org/src/commit/?id=3502f06c6686fbb8335872b8bb3b951b549d8b2f
commit 3502f06c6686fbb8335872b8bb3b951b549d8b2f
Author: Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2025-04-01 08:09:37 +0000
Commit: Philip Paeps <philip@FreeBSD.org>
CommitDate: 2025-05-06 01:57:32 +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
(cherry picked from commit 91506dba7f2eb147eeb55ec30640bc11755a1e8e)
---
share/zoneinfo/Makefile | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index d52ddb7c768d..e903a66dcfab 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -87,6 +87,20 @@ zoneinfo: ${TDATA}
umask 022; cd ${.CURDIR}; \
zic -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
#
# Sort TZS to ensure they are the same every build. find -s might
@@ -110,6 +124,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:
#