From nobody Sun Jun 21 19:20:13 2026 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 4gk1PT62yhz6hbnP for ; Sun, 21 Jun 2026 19:20:13 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gk1PT4kTNz3bHR for ; Sun, 21 Jun 2026 19:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782069613; 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=ji+uSJVv90WbIWyfu3FwfOqMVXIe0W+quu+wNTn7u8Y=; b=u3Y6lhjaSnH4UmaN6XK3TW3SkZAtLtgmhRrMCaiHQLsuRvtCv7CcC8kSXUbAC9ZSGfxeZ2 XtWYJHI2kNnTV+4KsvmLPoIzUkqOtxoY6klfDmEIoLeaan1048jY4im1HnCTMRaG7Jzr3F VQnmdY82nr6PwY1HeOBrPCuRTHEKK7LzSphqYBc0Qg/89E8cTP6fae6fiKtehbRlwA+1rC 5Ww9YvYiaZVEPGvbryA+yfFP+x9pnouqK1d6qC0EMiLMmOWOfgCsCt1aLeKPo7dwhRlJew dVB4CUsGsw9ptPEks7iV9yq7LGUDcu/duNZH9kIOmfk5e6Mlqfo5rSfTQ/nHDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782069613; a=rsa-sha256; cv=none; b=TbuRHBQPn77D/gQVoJTZNZAv8V4KlB/WJ7KsFcwO7dEb0Kz1rQOlNhvVGllSlYhgR0OCSn mneJuxg4lvjxr/xN4t3g9F1la3Wh7bmArqDq/bpF8b7hbBWnQSnELBI8gcI/T2bz3bGG/z PSzJUPmcNHZpMBzukyPwcYeYbpKKSB/fFAb8hcvYUrcf7wf40tS1PX0pLmolRGxScsacp/ LtsGVNjsE4fWIyOEpBvT7/YRsew1/S8o7jIu3//csjYAGcSNElsCXjTwFqKZmJbNXIIPjX QEYSfEORRDW/in5oKgK+f8/FX1HR1uV2kmZyHkfDHkhba0vwtCsDL2BvZL6q0w== 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=1782069613; 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=ji+uSJVv90WbIWyfu3FwfOqMVXIe0W+quu+wNTn7u8Y=; b=AsqdQa5Ip4C+/wq/B/1ursuTRhpDdRU5BykXtnL1KNZbtUU9lH4H9Hpmqp3rgs3FZV85Da N59GfJyWBGARQ21bafrkLmmrhizkxoNLVGhJ1xxyiHxMpBSnpMJ1vuP4gq+AkM4/XqwQI4 eN/bgRLz98lhv4hGSZCVXVPrn4KRyiFUxYmQ1evIktG097XStoc4s5eA0Leejb2dRahqBO CdPVGw7bBTo7yt8c+qVFrQ4x0O1oUIWKZQItTUx3GTwr7iMkTR5FbLGzeV38H+EEC6GaIF I2frrwvtNiB16HTkdGHwCKkrlVvjIM+17NLOQA2iw1TJmA9TNPP3eInHUIfb+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gk1PT2z2vzDd for ; Sun, 21 Jun 2026 19:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3662e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 21 Jun 2026 19:20:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: c37839dc7b6a - main - meta.autodep.mk remove extra } 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: c37839dc7b6a4d5f2c4d5bddda6595782a83dae4 Auto-Submitted: auto-generated Date: Sun, 21 Jun 2026 19:20:13 +0000 Message-Id: <6a38396d.3662e.4ff9fa08@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c37839dc7b6a4d5f2c4d5bddda6595782a83dae4 commit c37839dc7b6a4d5f2c4d5bddda6595782a83dae4 Author: Simon J. Gerraty AuthorDate: 2026-06-21 19:19:29 +0000 Commit: Simon J. Gerraty CommitDate: 2026-06-21 19:19:29 +0000 meta.autodep.mk remove extra } remove extra } from GENDIRDEPS_ENV more debug output for gendirdeps.mk Reviewed by: stevek Differential Revision: https://reviews.freebsd.org/D57727 --- share/mk/gendirdeps.mk | 14 +++++++++++--- share/mk/meta.autodep.mk | 6 +++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/share/mk/gendirdeps.mk b/share/mk/gendirdeps.mk index e5f536441a8d..ad964e062205 100644 --- a/share/mk/gendirdeps.mk +++ b/share/mk/gendirdeps.mk @@ -1,4 +1,4 @@ -# $Id: gendirdeps.mk,v 1.56 2026/06/19 18:57:57 sjg Exp $ +# $Id: gendirdeps.mk,v 1.57 2026/06/21 19:04:57 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -163,10 +163,12 @@ META2DEPS := ${META2DEPS} .if ${_debug.gendirdeps} && ${DEBUG_GENDIRDEPS:Mmeta2d*} != "" _time = time +_set_x = set -x; _sh_x = sh -x _py_d = -ddd .else _time = +_set_x = _sh_x = _py_d = .endif @@ -244,7 +246,11 @@ x != echo; for m in $$_meta_files; do echo $$m; done > meta.list _meta_files_arg:= ${_meta_files} .endif -dir_list != cd ${_OBJDIR} && \ +.if ${_debug.gendirdeps} +.info ${RELDIR}: _meta_files_arg='${_meta_files_arg}' +.endif + +dir_list != cd ${_OBJDIR} && ${_set_x} \ ${META2DEPS_CMD} MACHINE=${MACHINE} \ SRCTOP=${SRCTOP} RELDIR=${RELDIR} CURDIR=${_CURDIR} \ ${META2DEPS_ARGS} \ @@ -256,6 +262,9 @@ dir_list != cd ${_OBJDIR} && \ .warning Skipping ${_DEPENDFILE:S,${SRCTOP}/,,} # we are not going to update anything .else +.if ${_debug.gendirdeps} +.info ${RELDIR}: raw_dir_list='${dir_list}' +.endif dpadd_dir_list= .if !empty(DPADD) _nonlibs := ${DPADD:T:Nlib*:N*include} @@ -276,7 +285,6 @@ ddeps != cat ${ddep_list:O:u} | ${META2DEPS_FILTER} ${_skip_gendirdeps} \ sed ${GENDIRDEPS_SEDCMDS} .if ${_debug.gendirdeps} -.info ${RELDIR}: raw_dir_list='${dir_list}' .info ${RELDIR}: ddeps='${ddeps}' .endif dir_list += ${ddeps} diff --git a/share/mk/meta.autodep.mk b/share/mk/meta.autodep.mk index 2120c0892475..a4d43f19fec1 100644 --- a/share/mk/meta.autodep.mk +++ b/share/mk/meta.autodep.mk @@ -1,4 +1,4 @@ -# $Id: meta.autodep.mk,v 1.71 2025/08/09 22:42:24 sjg Exp $ +# $Id: meta.autodep.mk,v 1.73 2026/06/21 19:01:21 sjg Exp $ # # @(#) Copyright (c) 2010-2025, Simon J. Gerraty # @@ -275,7 +275,7 @@ META_FILES = ${.MAKE.META.FILES:N.depend*} # objects in subdirs META_FILE_FILTER += S,${_OBJDIR}/,,:O:u # we have to defer evaluation until the target script runs -GENDIRDEPS_ENV += META_FILES="${META_FILES:${META_FILE_FILTER:O:u:ts:}}}" +GENDIRDEPS_ENV += META_FILES="${META_FILES:${META_FILE_FILTER:O:u:ts:}}" .if ${_debug.autodep} .info ${_DEPENDFILE:S,${SRCTOP}/,,}: ${_depend} ${.PARSEDIR}/gendirdeps.mk ${META2DEPS} xtras=${META_XTRAS} @@ -305,7 +305,7 @@ GENDIRDEPS_ENV += MAKESYSPATH=${_makesyspath} GENDIRDEPS_ENV += MAKESYSPATH=${.SYSPATH:ts:} .endif -${_DEPENDFILE}: ${_depend} ${.PARSEDIR}/gendirdeps.mk ${META2DEPS} $${.MAKE.META.CREATED} +${_DEPENDFILE}: .NOMETA ${_depend} ${.PARSEDIR}/gendirdeps.mk ${META2DEPS} $${.MAKE.META.CREATED} @echo Checking $@: ${.OODATE:T:[1..8]} @(cd . && ${GENDIRDEPS_ENV} \ SKIP_GENDIRDEPS='${SKIP_GENDIRDEPS:O:u}' \