From nobody Thu Apr 18 21:07:32 2024 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 4VL9Mm5Xr6z5HZvl; Thu, 18 Apr 2024 21:07:32 +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 4VL9Mm2zjcz4TK9; Thu, 18 Apr 2024 21:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713474452; 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=76zXZsk28L098Utptg/z4+Dv6z+vt6J7grpYb6rQbPc=; b=kivY/KUF0ca/BSHEIbLmVf/QfyrOMLLjfIrt+7IHSJlqUy/cfR+MpUVsuwZr0bUE/KRnf6 lamaOwZUVlKV4NQWx9MOyreUhZhyDvbPq8OzVJW5vGCSvpmKJ4IQbXh0iYfb2Y9LyJXB3R gHCuI7eLSA6dttlCTrDehSyEGqnDfU4PXY+TnmKhRf6Kzj5F/jQE7cMXN6JgMLanadUlu2 HzZKIg0WNTUSDPXKz/V7vwPpPvvu/Da2AJVY94JE2JLcBefdgT1n7x8GxWeg101jgcc1Je U1ufbg/lwrl13oNHvEo79wboeqi3EfeFHNelwqMzhuy8i5rxLsbr00b2/7TJAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713474452; a=rsa-sha256; cv=none; b=pDwokYPRzWjEzspMkwv1oM3y5a44kzpNNU4v4vMGksL27kJRoJNJnVrNC3fjjMmn6RM0eO 2gbpUpF1dUGQ89QGGjKZ9zFKXLJf7Ohd9d9/uTfS3KoodV3u8QxXp8VWdZjL47nOlRC6hh NFAiATrObUMM+uzEPT1IZddN+VQStV5NC1n0bYtVgiNLN/VXtOP8JuDG9yQnHkUZjjQL0u Cth4F8FNSjNriGbi4elY7ykSjiiLUEH2pbU4yyxzW21cHppp5ekI3Tj7UKMiu5gPIySl7V 8x8ODkZnVaj9O614VSDXDPfsUjDNXI6NU9hucz/hSdJYowL4Vey+b8DdeVqWlw== 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=1713474452; 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=76zXZsk28L098Utptg/z4+Dv6z+vt6J7grpYb6rQbPc=; b=c+6vFf9Mcv3ftSwc03/TV0NSOOGqrXvLM9Z3VIpaJ1ZeDLsJKi+y7697/a40DgChynmphJ q+BOsws9R4r96q0HOlWb8Qhv4Slv7ZgGfl+xun17mZQlzwE5j136W3yP0kfk4BxLuag0dL egEnWzKx6MDwsCtGYjLXuiD7SjfuCHkIVtMeWrtv4E0FEs0eIMlJ5xZpCCQ/kUGIXJH1vC 7eJaFYJOCbLuXmNzz20dX/VUFrvpwKn0SApar7Qqvup56C3U+1HYE+EG+ktM8bhdx5OCTt Tnw5xQ3hkWfZ4oFlBgLdSvMecxQ52TFSypwRT//ZldwLBAgd6HbtE/AuLanXIg== 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 4VL9Mm2ZFGzQ22; Thu, 18 Apr 2024 21:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43IL7WYQ008677; Thu, 18 Apr 2024 21:07:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IL7W3D008674; Thu, 18 Apr 2024 21:07:32 GMT (envelope-from git) Date: Thu, 18 Apr 2024 21:07:32 GMT Message-Id: <202404182107.43IL7W3D008674@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: f697b9d03d99 - main - Update sys.dirdeps.mk set default DEP_* 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f697b9d03d998da8ec69f2028dd7702a42adc3fc Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f697b9d03d998da8ec69f2028dd7702a42adc3fc commit f697b9d03d998da8ec69f2028dd7702a42adc3fc Author: Simon J. Gerraty AuthorDate: 2024-04-18 21:07:24 +0000 Commit: Simon J. Gerraty CommitDate: 2024-04-18 21:07:24 +0000 Update sys.dirdeps.mk set default DEP_* Even at level 0 it is handy to default DEP_* used by Makefile.depend* to aid the first include if in a leaf dir. Reviewed by: stevek --- share/mk/sys.dirdeps.mk | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/share/mk/sys.dirdeps.mk b/share/mk/sys.dirdeps.mk index 1e3363c22339..4d2dfa8416fa 100644 --- a/share/mk/sys.dirdeps.mk +++ b/share/mk/sys.dirdeps.mk @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-2-Clause # -# $Id: sys.dirdeps.mk,v 1.14 2024/02/25 19:12:13 sjg Exp $ +# $Id: sys.dirdeps.mk,v 1.15 2024/04/18 17:18:31 sjg Exp $ # # @(#) Copyright (c) 2012-2023, Simon J. Gerraty # @@ -196,11 +196,10 @@ RELSRCTOP?= ${RELTOP} # just in case .MAKE.DEPENDFILE ?= Makefile.depend -.if ${.MAKE.LEVEL} > 0 -# Makefile.depend* also 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} +# Makefile.depend* often refer to DEP_MACHINE etc, +# we need defaults for both first include in a leaf dir +# and when level > 0 +# so ensure DEP_* for TARGET_SPEC_VARS and RELDIR are set +.for V in ${TARGET_SPEC_VARS} RELDIR +DEP_$V ?= ${$V} .endfor -.endif