Date: Thu, 1 May 2025 06:38:26 GMT From: Philip Paeps <philip@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 4aed98a65ac9 - stable/14 - zoneinfo: also install tzdata.zi and version Message-ID: <202505010638.5416cQtr075831@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=4aed98a65ac91a65dc711fe1df5bdd1842d5c391 commit 4aed98a65ac91a65dc711fe1df5bdd1842d5c391 Author: Philip Paeps <philip@FreeBSD.org> AuthorDate: 2025-04-01 08:09:37 +0000 Commit: Philip Paeps <philip@FreeBSD.org> CommitDate: 2025-05-01 00:51:12 +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 d4b37ce991aa..54d715916b71 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -99,6 +99,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 @@ -114,6 +128,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: #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505010638.5416cQtr075831>