From nobody Wed Apr 19 03:15:58 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 4Q1Qsq0HQzz44rWF; Wed, 19 Apr 2023 03:15:59 +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 4Q1Qsp6jKSz4543; Wed, 19 Apr 2023 03:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681874158; 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=XvRZE0U8b8WdrtehvILRcllgogGZkIq9mK3a8XJgPwQ=; b=X0qt62ImacOeJGGFfBSaRJyFXwaD8qzaz8ZvMtPH9nWhu4iE3tx3TUX5WNj4b+TffSGRhc Dj6/gMBwg+iw8+PCca3QZ0jZdkqFJCur5FODiydrDwO/QPfD3AyrFMD6erjEMb6TktQ1Kf yhjR+7thIp0fqMmmDqU9wwC5wOcHFMDgFeNbK0aT2pQg1Ub+6yrsY6Fs81JNM8YkTmgVvf veG5XqCRA3TzEUN2XO3pRjfr/0I7hjZS4lNhjN4MrjuUJQg47/RObeTNqSOGtfOwda9eeb blNYzqsEBvcloz09cIwgGk81zfOLjNDRlHbqsnJgLDB3XwLx00faY+retRAVVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681874158; 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=XvRZE0U8b8WdrtehvILRcllgogGZkIq9mK3a8XJgPwQ=; b=Gr9+tWx1WU3Ey5oCuW7AbCokvf5fbgHehBq8h6Q0kYbrnw53Xu9t8jI/6+uhV+XRoZqL8s bp+xINVsZ7ODmBghRB4Cv6kzkCaPe+C9STqOrIddSoAefgn3wTN5hRxtvhaB0vGjNfXI6h ZmpGi5iZ6MprIVsEuxXpKMkDkp3Y1EO41uYLtSgXo6KfPrq5izZklFhzoOwZy8M1QCeNeb rkY+S8iQrZitV2jHoQucOtSpRGxarFvcoqEtQMFBAbOOYdiEbNIdHcoQyolfDgXus2GVbq DLfC1RtBrNADzJsWYEiZ5QKjSaxlM9kwktnukenddfP6H9Pbj77sxqcvqDRu5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681874158; a=rsa-sha256; cv=none; b=tj7JpnZO1SOcqJyZF/Vs6yv2UmduUfTbM5cdCu2b6xfw5VaT18tnRjnGe3JyfgCxm5xyUC rVXDrkfCzFbOmq/tJ7VaitZTL8YhwWXWm5EwVqUgTxf/j+IEk1xJnNUI7aBUTpwUT9gfDS qh1SFHshloNB2zHXvoydPrHuJU5njG7p2YYmNvUvwQ+APTNHzaiVJnGtH7vfV3K/VKcFBv zgLDrdtbX8DazwTewlKOU4B3xPXWDFjVplhl3reyHObIF6Bvmsl59Sba4Ig6CQB6wI8iPk zQrMVYqOMm5y4uSxnqLhZtDHb1aMoLN8lq7/74GGOHL18bspWHbGW/pMMpoRcA== 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 4Q1Qsp5dt9zf5N; Wed, 19 Apr 2023 03:15:58 +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 33J3Fw80091299; Wed, 19 Apr 2023 03:15:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33J3FwEc091298; Wed, 19 Apr 2023 03:15:58 GMT (envelope-from git) Date: Wed, 19 Apr 2023 03:15:58 GMT Message-Id: <202304190315.33J3FwEc091298@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: 9eaf82f27c4f - main - dirdeps.mk guard against inclusion from Makefile.depend.options 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: 9eaf82f27c4fb368385ff759a2195bd92c369684 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=9eaf82f27c4fb368385ff759a2195bd92c369684 commit 9eaf82f27c4fb368385ff759a2195bd92c369684 Author: Simon J. Gerraty AuthorDate: 2023-04-19 03:15:25 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-19 03:15:25 +0000 dirdeps.mk guard against inclusion from Makefile.depend.options A typo in Makefile.depend.options including dirdeps.mk rather than dirdeps-options.mk can result in infinite recursion - don't let that happen. Reviewed by: stevek --- share/mk/dirdeps.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/mk/dirdeps.mk b/share/mk/dirdeps.mk index b213ddc28fb7..90ef5f55c790 100644 --- a/share/mk/dirdeps.mk +++ b/share/mk/dirdeps.mk @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.155 2023/04/15 05:46:19 sjg Exp $ +# $Id: dirdeps.mk,v 1.156 2023/04/18 18:39:09 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -349,6 +349,10 @@ BUILD_DIRDEPS ?= yes DIRDEPS_CACHE ?= ${_OBJDIR:tA}/dirdeps.cache${_TARGETS:U${.TARGETS}:Nall:O:u:ts-:S,/,_,g:S,^,.,:N.} .endif +# sanity check: Makefile.depend.options should *not* include us +.if ${.INCLUDEDFROMFILE:U:M${.MAKE.DEPENDFILE_PREFIX}.options} != "" +.error ${DEP_RELDIR}/${.MAKE.DEPENDFILE_PREFIX}.options: should include dirdeps-options.mk +.endif # pickup customizations # as below you can use !target(_DIRDEP_USE) to protect things