From nobody Thu May 04 16:46:56 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 4QC08c4m3fz49JCT; Thu, 4 May 2023 16:46:56 +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 4QC08c4KBhz40tT; Thu, 4 May 2023 16:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683218816; 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=RV/0RXiFNfxv22mfO8f79TPTtBuGvpA2nOk2zezs1U8=; b=a0vAEQeIGbKjsV+R6MB+kLKixcyoImniuWAR71e3A/EhS2ZKyJwvcbs3d1j6RSyhOmIj4f HvO06oZgy5xbZCy7SC3FA7k/ozTbZMo5epPgbnWTIH09uBtKw/5mEBnrLsee4E6rmyN3zg 0VCjSj/SrWClI5nm3VCyLTK5sX5OS5EIHGsymLJx89pJMpbzXaqz1p6jl7aO10LTK5+Aul iRZ91KUU4Tul2NoOClPLby+N+7KuTuQeAxq7e4EcU5CKS8ZYLIkSzEOrN5YxtueRIbA8Kd pbyAOoD7oBVoVuyMD3Uxm4etfss4oFBJ1DiL4G0PscmWNYjH4OWep8QomldzcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683218816; 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=RV/0RXiFNfxv22mfO8f79TPTtBuGvpA2nOk2zezs1U8=; b=aFhzuSSGMH3coQ/QmMdOB9ZwfXbvPGikLa4dmtDmGTTIQr4o7w6q/jpxyF0WPgxwKVKfOG lTHWBlDcf8lktUM34shntmwkW7d1C8XFd2J8tEEIVTKA9S6jsIVoSM1FVTkNjN+Q6FBcIl ScBj2D1FrUJuG2QaJiV+UoL8JbQ7fZqNP8eXEO0Sp20HEz0rGBa55tRWLwT7NSa6ryd8Wc nMc0s0H2sZEMMigkawthx8UXZRgBZ4JYvAJUEvWgOaTR7Z9F1aCy/auBJVSRHxFn+FjXIi MGuDib2ZUF3McT6YvaUdiaMBhDZwYfHjln/3yn77meca+5Lmhj9Vhzfn9DyfYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683218816; a=rsa-sha256; cv=none; b=wqY95cWccOt3M/7w4EyBjFZPVm42NYaNq6O0QfqHGI7WWAthpBs+4WNIbrn3Npdw+saw7C 2xkgDE86xWgCMm85VzTe4J2HBdanAfP/iB1x9yWQ2w4/SWWUvZPsVwG61mMTihN52qU8aN lC2g74Zf2OF6mihD6P4wv3qpBpPrHtfJpBBVQMjjiPUmUJLNZoMAYS/YA0KZzvVw5lrlzW UwbFteVBfvHFGGCe3dZCKPLMsJKFrkRLXyjUOddd6IIpa6HNiCIdv5CVV6Mxmf2EPHeO0T y8RN89kZKmFYBsU3A489JbiTlchiE6tQw56XF5XcIDbJw07H0o+7xbpU+72/GA== 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 4QC08c3MqYzKJ6; Thu, 4 May 2023 16:46:56 +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 344GkuVR068413; Thu, 4 May 2023 16:46:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 344GkuIb068412; Thu, 4 May 2023 16:46:56 GMT (envelope-from git) Date: Thu, 4 May 2023 16:46:56 GMT Message-Id: <202305041646.344GkuIb068412@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: 42d088299cd4 - main - Update meta.sys.mk ensure DEP_* set at level 1+ 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: 42d088299cd44287d6f532a6a93ac9c78ce74de7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=42d088299cd44287d6f532a6a93ac9c78ce74de7 commit 42d088299cd44287d6f532a6a93ac9c78ce74de7 Author: Simon J. Gerraty AuthorDate: 2023-05-04 16:46:47 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-04 16:46:47 +0000 Update meta.sys.mk ensure DEP_* set at level 1+ --- share/mk/meta.sys.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/share/mk/meta.sys.mk b/share/mk/meta.sys.mk index 7a74ba2d5d21..f580f4962be8 100644 --- a/share/mk/meta.sys.mk +++ b/share/mk/meta.sys.mk @@ -1,4 +1,4 @@ -# $Id: meta.sys.mk,v 1.46 2023/04/18 18:43:00 sjg Exp $ +# $Id: meta.sys.mk,v 1.48 2023/05/04 16:41:10 sjg Exp $ # # @(#) Copyright (c) 2010-2021, Simon J. Gerraty @@ -188,7 +188,7 @@ META_NOECHO= : UPDATE_DEPENDFILE= NO .export UPDATE_DEPENDFILE .elif ${_filemon:T} == "filemon" && !exists(${_filemon}) -.warning ${.newline}ERROR: The filemon module (${_filemon}) is not loaded. +.error ${.newline}ERROR: The filemon module (${_filemon}) is not loaded. .endif .endif @@ -206,6 +206,15 @@ dirdeps: .endif .endif +.else # level > 0 + +# Makefile.depend* get read at level 1+ +# and often refer to DEP_MACHINE etc, +# so ensure DEP_* (for TARGET_SPEC_VARS anyway) are set +.for V in ${TARGET_SPEC_VARS} +DEP_$V = ${$V} +.endfor + .endif .else META_COOKIE_TOUCH=