Date: Fri, 21 Apr 2023 04:01:07 GMT From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 552815b2da6e - main - zoneinfo get zic from stage tree during DIRDEPS_BUILD Message-ID: <202304210401.33L417aC011441@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=552815b2da6ee05c89e2d77970e0c010cf83d307 commit 552815b2da6ee05c89e2d77970e0c010cf83d307 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2023-04-21 04:00:17 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2023-04-21 04:00:32 +0000 zoneinfo get zic from stage tree during DIRDEPS_BUILD --- share/zoneinfo/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 17dce860edae..2e8e0cd53cd2 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -82,11 +82,15 @@ META_TARGETS+= zoneinfo install-zoneinfo # ZICFLAGS?= -b fat +.if ${MK_DIRDEPS_BUILD} == "yes" +ZIC= ${STAGE_HOST_OBJTOP}/usr/sbin/zic +.endif + zoneinfo: ${TDATA} mkdir -p ${TZBUILDDIR} cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS} umask 022; cd ${.CURDIR}; \ - zic -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \ + ${ZIC:Uzic} -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \ ${LEAPFILE} ${TZFILES} #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304210401.33L417aC011441>