From nobody Thu Apr 24 15:25:27 2025 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 4Zk0Cr293Bz5tRn7; Thu, 24 Apr 2025 15:25:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zk0Cq6zHsz3qSf; Thu, 24 Apr 2025 15:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745508328; 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=WveUEruMXeGNGow9t7mJodfjQ0Qx3Ox66ANfBHWgHeU=; b=niq1pcpEPZXDNTzynV76PqhDTwGHiJNbYdI67yRfZimFi2rK/YKTBKyzjOxLa+tFWLwcJt tg5JKFXfrb6+J190oV2kVTlEN4A153QItcr3UJvjrkuToOjWdL6jak4E/cyvJ/ovYtKQXY 6aGCtlnM+zYnD8DnBQFeUWOq8/H4U8aQnJ7gXhmnmy/+pfmJqxVP9LVy+aIwLbfN3N+22R U4U2gpxsVKuQpSw3C0WvwyfpG9uV7ul3plNMgNr+fJX0EbJ6o4+R4hWj0JEnBJIv4E6FHX hdzBFrmPBpKSJfcMuk0WU/JNKbk83HvS2wLRzs+rWvKXbFGYrkd/mFECHHedZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745508328; a=rsa-sha256; cv=none; b=Zb0wtbFlYtQ77mXbZRwDjcyA0oczxbirVquTop6CnpvCXlJ3WdX3j/YnJeHAbklRZAi2La LXCBv+VbGAJoUZXeISlFPahvj6eCnPlybyyeKOXJqNP91qebKoM+1w5ksr3lsHXHXAJANo SGbS5OLmk+lXp/Jiv9/Sp6izuo1qsGNaJHPwM0Oj69x8lf2tjP3I2SuKTksUmFr2NwdWhH M5zpSm3iWPMRoXJMdflz9WsVPfPzBKfYQmYuwn72/H6eXEvAKzv8M7WnSVc/BPB48SLmyK tMeDVOvOCDIvU/FUGdjcHkEHYPRjUC1BEsuyl0Oln9rva/JtgfRiQTfdOi3eKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745508328; 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=WveUEruMXeGNGow9t7mJodfjQ0Qx3Ox66ANfBHWgHeU=; b=Jloa/092rlgO3pcjcg+8BUELQbC/7zfS2WSb47nHZ6ySnQTkl/BDhFb0HnDV5tFAN2Xo35 ThUKLCe7++trOoW91nrK0y86lmi3Coo1bZ2PBH25zBuV6FTPsXgO0S6U3sSQYLmLFYCcDZ f7Es1XSK45iKqAOFaUF/iGuHj/TF0PvwAsfzMwpo+Cxb/JjWqsg8w6EMI7/JuxcD6k+Ob5 0mHjtkpgj3NwAVp9OfhG/ED9Nbp8fC+8OsfEb1SDY3MiSy+wi3Ybsi3TPC8PbrzghYA+TD UJT+mTRcV7+TNXORw8TIe9BTxT1mP456bGoVQthjFZVjDDD3/w+wxdv4fgkfvQ== 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 4Zk0Cq5Z4Tzvsg; Thu, 24 Apr 2025 15:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53OFPRP3069840; Thu, 24 Apr 2025 15:25:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53OFPRjN069837; Thu, 24 Apr 2025 15:25:27 GMT (envelope-from git) Date: Thu, 24 Apr 2025 15:25:27 GMT Message-Id: <202504241525.53OFPRjN069837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b7f4fcc27f4f - stable/14 - Fix share/zoneinfo for 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b7f4fcc27f4f19f346e2e4a5907ae1aab388e84f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b7f4fcc27f4f19f346e2e4a5907ae1aab388e84f commit b7f4fcc27f4f19f346e2e4a5907ae1aab388e84f Author: Simon J. Gerraty AuthorDate: 2023-11-20 20:51:25 +0000 Commit: Ed Maste CommitDate: 2025-04-24 14:01:58 +0000 Fix share/zoneinfo for DIRDEPS_BUILD The tranditional build makes multiple passes through the tree. The DIRDEPS_BUILD visits each directory only once per architecture, thus makefiles should be able to everything they need in a single pass. The use of TZS!= when doing make(*install*) only works if the directory has previously been visited to do zoneinfo since before the zoneinfo target is run TZS will be empty. To fix this, have the zoneinfo target capture the list of files to zoneinfo, and install-zoneinfo use that list. Rename that target to zonefiles - since that is now what it does. This is more efficient - we only gather the list of zones when it is likely to have changed, and allows the makefile to do everything in a single pass. Reviewed by: stevek Differential Revision: https://reviews.freebsd.org/D42624 (cherry picked from commit 0a45a7e99fc3061e91732ad88671721e95082d5e) --- share/zoneinfo/Makefile | 28 +++++++++++----------------- share/zoneinfo/Makefile.depend | 1 - 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 60ae1f76f5b5..d4b37ce991aa 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -78,9 +78,9 @@ TZBUILDSUBDIRS= \ TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil .if !defined(_SKIP_BUILD) -all: zoneinfo +all: zonefiles .endif -META_TARGETS+= zoneinfo install-zoneinfo +META_TARGETS+= zonefiles install-zoneinfo # # Produce “fat” zoneinfo files for backward compatibility. @@ -89,33 +89,27 @@ ZICFLAGS?= -b fat .if ${MK_DIRDEPS_BUILD} == "yes" ZIC= ${STAGE_HOST_OBJTOP}/usr/sbin/zic +# we do everything in a single visit +install-zoneinfo: zonefiles .endif -zoneinfo: ${TDATA} +zonefiles: ${TDATA} mkdir -p ${TZBUILDDIR} (cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS}) (umask 022; cd ${.CURDIR}; \ ${ZIC:Uzic} -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \ ${LEAPFILE} ${TZFILES}) - -# -# Sort TZS to ensure they are the same every build. find -s might -# be a shorter way to express this, but it's non-portable. Any -# differences between the two don't matter for this purpose. -# -.if make(*install*) -TZS!= cd ${TZBUILDDIR} && find * -type f | LC_ALL=C sort -.endif + (cd ${TZBUILDDIR} && find * -type f | LC_ALL=C sort) > ${.TARGET} beforeinstall: install-zoneinfo install-zoneinfo: mkdir -p ${DESTDIR}/usr/share/zoneinfo (cd ${DESTDIR}/usr/share/zoneinfo; mkdir -p ${TZBUILDSUBDIRS}) -.for f in ${TZS} - ${INSTALL} ${TAG_ARGS} \ - -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${TZBUILDDIR}/${f} ${DESTDIR}/usr/share/zoneinfo/${f} -.endfor + for f in `cat zonefiles`; do \ + ${INSTALL} ${TAG_ARGS} \ + -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${TZBUILDDIR}/$${f} ${DESTDIR}/usr/share/zoneinfo/$${f}; \ + done ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ diff --git a/share/zoneinfo/Makefile.depend b/share/zoneinfo/Makefile.depend index 777ef7ba01c5..141855c83ab0 100644 --- a/share/zoneinfo/Makefile.depend +++ b/share/zoneinfo/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - usr.bin/xinstall.host \ usr.sbin/zic.host \