From nobody Fri Apr 21 04:01:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2gmz6Zpdz4734F; Fri, 21 Apr 2023 04:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2gmz5Tc1z49MD; Fri, 21 Apr 2023 04:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682049667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VjN//my15Tf8LpU5HeQ7EQBF+dbqt13D9GxJEh46xA4=; b=utseu7WtD2feOWnKHCoLWFIVPvMGTELAl0LMDNhgOCXj8Fe/a5qjJTsunvK8XVDuB3P7MK 0LMK7+0IENLhQtmJymUa+wIn5i/L37REwtVxkjBE0OaFSCXyCAe0/udqqN4ECj256z8q2d anMf7XOpTJFd31kds2WZPt4vSr3lWd+uxy7Bm0+pUUq82zP254I8gMMxE+YSWkznDl6mG3 yLLPPgFN9rtYGNzDEYUEi65lFzwDHZaWrT7O3IYaWcbdK5LVAuXVSYLja4Q5JMa6N89nwH SsfDg2wNAbANKJCzvmQims2Ymf/YcJtNwYOyd8m1nrPE69zpu7yAP5XV4cPwNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682049667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VjN//my15Tf8LpU5HeQ7EQBF+dbqt13D9GxJEh46xA4=; b=PFDz6f1gIUTec1aOl29qBOqzXH0Dd0ew/0bdOHy33gyelt312FrnC9pDdqTKcfJnAR+Odc +TfefeXDXc90SYTloqayl28l1zBDIRF2X1+mhtRFmAoif8G2MQBsRVOcq3M1dO3HBfwNOe HxRV0cDV/cOUGQrD9N6+tpTCuybSdhG2MTYsr8S2B+R/qrprf+YgZ1MqrHGtxHsBOVBihe kxc8XzNOnqWApohWtvzoNsaCAu54ROeQsOJXibk2PjXw4nssEthLZzXpn3eQcwYcsLqgRC zYEWD8v1nNtXb/kGhwUA506SczPjSQHXJhCoNdi4+NJSZW9pTSatMvL8PVk2UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682049667; a=rsa-sha256; cv=none; b=fGZWvMUSN4beTK5+4jtuhp706xSNm48IkMSbqxcA6pOG/8HrUIa03Wpb3h/rG6617D8rVC TkOyyZU4IRYuvbo/8XW09yAkW5NHIECs5GzUceRfh3QLrddoVLjAuT+U9veHSgabJ6Zi0E NL7xjNLsW1TQZazCRgPdQ8czhuKu8wi7phSXvzCe7DvZD3doaH5VxGEf7X0Zqz6yz7i4AB Riv3VdAGX1KnPFawB1x1sZZhIaFwOM5RHTy9EollvykSOwvlRug9eVNzqCyr0ceKwaFvjX ijQrLWetpdFunl8H4ITK4sC72V6AL8WfG3x/SMImxkUMhp6sRckyqjnuN4TEkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2gmz4ZMdz15FZ; Fri, 21 Apr 2023 04:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33L417Ti011442; Fri, 21 Apr 2023 04:01:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L417aC011441; Fri, 21 Apr 2023 04:01:07 GMT (envelope-from git) Date: Fri, 21 Apr 2023 04:01:07 GMT Message-Id: <202304210401.33L417aC011441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 552815b2da6e - main - zoneinfo get zic from stage tree during DIRDEPS_BUILD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 552815b2da6ee05c89e2d77970e0c010cf83d307 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=552815b2da6ee05c89e2d77970e0c010cf83d307 commit 552815b2da6ee05c89e2d77970e0c010cf83d307 Author: Simon J. Gerraty AuthorDate: 2023-04-21 04:00:17 +0000 Commit: Simon J. Gerraty 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} #