From nobody Mon Apr 17 01:17:34 2023 X-Original-To: dev-commits-src-main@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 4Q08L72klGz451PP; Mon, 17 Apr 2023 01:17:35 +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 4Q08L65wP4z3Lj4; Mon, 17 Apr 2023 01:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681694254; 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=vYNIR/0kkPIvjo1p9eYqPLAoXSlnOTdiAwyLKM4/ht0=; b=tnnogBLf0eoVsh+7vrr4HQJ5u4GcvGuCLkSz4KhiRSUcsVxQNC0EpJCAeU+Mvu5D2/hroh ujehpFkn1ZmI80oFJ55rlWPVkuqBsNk5ewrlyYdJhN/6gGK0cH5+KQ14TTqr2vLBY9LEVI lwZF+AmggyfKNCFYOJwax23RFk+gvrdqK+cq+CImg/s7/Js2+FaTl/7ixI28IezUqaWLy5 0FvDvNGwaXRHU+OReYswvaF6onF56KcwXqOWVVjY678FthqfQ3Pc/h13I8elVJ4h4wCOPy Oglh5jANJ3YGOr5MDzn96QNYE+sGghCkoPogLhFAbt6AjhwOgo0UTFa+ScW9Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681694254; 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=vYNIR/0kkPIvjo1p9eYqPLAoXSlnOTdiAwyLKM4/ht0=; b=ZrptfqhTjFO3HMbNpzA9fWrWm47Mz0pXnSg2CSEve7yrzog2Ahs8PFSyPfdS2yfb24a+5T Py/RLeECUHbywC4MLdr7ipGji+I746fprn8JkwhfhxR9CmNPezzZ9FTobOn7J/K/jKbNvI OKHoNTb8w6zJ9qk4//R64dpN1ScQB258FVXl1+F7s+mM9HvKp/FTk7WtB2rX6egJRF2Cov tO+Zp9jRl/CNgarxj7MiRlDy/DKlYoi32e6gVTXA4YVr6RdR94PYnWty7YeoJimAJuRPsS RHe68WwdD3iciYZaXD/Uh/TPMTHqglk9YlIVdzxaK0RcQ/0GEhDpbhzflppMsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681694254; a=rsa-sha256; cv=none; b=ZEwkgMRfOzjIiBRBX+AwwccruvVMbTuOV71k7b6IV+roqccpiLVrGgChWM+sBCCjBo9eRK RzuGayoRdCLB9eoggF//XfQUSibAFS/TXcbBv1mKfFnxUbbfvT+JxRiX6cJS7685t9H6pW UTFDi5cXzw1Hqt34/if/w+unWdUu+Nasuzhi9Ibi4CBG6B9lJoU/QU7IjOZzH2P0fWI3Yj 0Hi7Kj/HFZT6TwF7vDmsUQnE/OUrFfD7obHb+HJuJYegzisNZDc0SJDzY47mnj5hv4Oipm TIYD/vVeBatxCCkSTceIvlv4RZqnKDW9sn0zWq6UHtivCO7r1AgC5dRCDeqQ7g== 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 4Q08L64zyqz18gy; Mon, 17 Apr 2023 01:17:34 +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 33H1HY9m037215; Mon, 17 Apr 2023 01:17:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H1HY3N037214; Mon, 17 Apr 2023 01:17:34 GMT (envelope-from git) Date: Mon, 17 Apr 2023 01:17:34 GMT Message-Id: <202304170117.33H1HY3N037214@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: a3d015bbf1ed - main - Update dirdeps.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a3d015bbf1eda630e5a5516f757627cdc23cd203 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a3d015bbf1eda630e5a5516f757627cdc23cd203 commit a3d015bbf1eda630e5a5516f757627cdc23cd203 Author: Simon J. Gerraty AuthorDate: 2023-04-17 01:17:26 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-17 01:17:26 +0000 Update dirdeps.mk Fix handling of local.dirdeps-missing.mk we need to reset DEP_RELDIR and DIRDEPS just as if including a Makefile.depend* Also fix a typo in DIRDEP_LOADAVG_REPORT and improve debug output. Reviewed by: stevek --- share/mk/dirdeps.mk | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/share/mk/dirdeps.mk b/share/mk/dirdeps.mk index ee31e47c76c5..b213ddc28fb7 100644 --- a/share/mk/dirdeps.mk +++ b/share/mk/dirdeps.mk @@ -1,6 +1,8 @@ -# $Id: dirdeps.mk,v 1.151 2022/01/28 01:13:14 sjg Exp $ +# $Id: dirdeps.mk,v 1.155 2023/04/15 05:46:19 sjg Exp $ -# Copyright (c) 2010-2022, Simon J. Gerraty +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2010-2023, Simon J. Gerraty # Copyright (c) 2010-2018, Juniper Networks, Inc. # All rights reserved. # @@ -179,7 +181,7 @@ _DIRDEP_USE_LEVEL?= 0 _CURDIR ?= ${.CURDIR} _OBJDIR ?= ${.OBJDIR} -.if ${MAKEFILE:T} == ${.PARSEFILE} && empty(DIRDEPS) && ${.TARGETS:Uall:M*/*} != "" +.if ${MAKEFILE:T} == ${.PARSEFILE} && empty(DIRDEPS) && ${.TARGETS:Uall:M*[/.]*} != "" # This little trick let's us do # # mk -f dirdeps.mk some/dir.${TARGET_SPEC} @@ -401,7 +403,7 @@ DIRDEP_LOADAVG_LAST = 0 # Note: expr(1) will exit 1 if the expression evaluates to 0 # hence the || true DIRDEP_LOADAVG_REPORT = \ - test -z "${"${expr ${now_utc} - ${DIRDEP_LOADAVG_INTEVAL:U60} - ${DIRDEP_LOADAVG_LAST} || true:L:sh:N-*}":?yes${DIRDEP_LOADAVG_LAST::=${now_utc}}:}" || \ + test -z "${"${expr ${now_utc} - ${DIRDEP_LOADAVG_INTERVAL:U60} - ${DIRDEP_LOADAVG_LAST} || true:L:sh:N-*}":?yes${DIRDEP_LOADAVG_LAST::=${now_utc}}:}" || \ echo "${TRACER}`${DIRDEP_LOADAVG_CMD}`" # we suppress SUBDIR when visiting the leaves @@ -577,7 +579,7 @@ ${DIRDEPS_CACHE}: .META .NOMETA_CMP ${"${DEBUG_DIRDEPS:Nno}":?DEBUG_DIRDEPS='${DEBUG_DIRDEPS}':} \ ${.MAKEFLAGS:tW:S,-D ,-D,g:tw:M*WITH*} \ ${.MAKEFLAGS:tW:S,-d ,-d,g:tw:M-d*} \ - 3>&1 1>&2 | sed 's,${SRCTOP},_{SRCTOP},g;s,_{,$${,g' >> ${.TARGET}.new && \ + 3>&1 1>&2 | sed 's,${SRCTOP},_{SRCTOP},g;s,_{SRCTOP}/_{SRCTOP},_{SRCTOP},g;s,_{,$${,g' >> ${.TARGET}.new && \ mv ${.TARGET}.new ${.TARGET} .endif @@ -788,8 +790,9 @@ ${_this_dir}.$m: ${_build_dirs:M*.$m:N${_this_dir}.$m} .if !target(_dirdeps_checked.$d) # once only _dirdeps_checked.$d: +_dr := ${d:S,^${SRCTOP}/,,} .if ${_debug_search} -.info checking ${d:S,^${SRCTOP}/,,} +.info checking ${_dr} .endif # Note: _build_all_dirs is fully qualifed so d:R is always the directory .if exists(${d:R}) @@ -822,10 +825,16 @@ DEP_RELDIR := ${_m:H:S,^${SRCTOP}/,,} # and reset this DIRDEPS = .if ${_debug_reldir} && ${_qm} != ${_m} -.info loading ${_m} for ${d:E} +.info loading ${_m:S,${SRCTOP}/,,} for ${_dr} .endif .include <${_m}> .else +# set these as if we found Makefile.depend* +DEP_RELDIR := ${_dr:R} +DIRDEPS = +.if ${_debug_reldir} +.info loading local.dirdeps-missing.mk for ${_dr} +.endif .-include .endif .endif