From nobody Sat Nov 04 17:18:29 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 4SN4852Rglz4yvwV; Sat, 4 Nov 2023 17:18:29 +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 4SN48522V0z3Qf6; Sat, 4 Nov 2023 17:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699118309; 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=z/TBliD5KSGlM5P4el2VFUFL1S/56GZbJNqGQOC6uFw=; b=hREo3rlHAcMHKOxI1Ph7ch2kmhP+gS/WTSZ9t16XV1slx7YZs2eSfkp0lyD0NDUqjUXh7P qpn0Y3sJfyM9giotU0Q1JM0KnTxW0wbhawo7isRsJUZG4i9a0Y5dDKlGgQ41EtTpGNDaqe 1btkrJ2jvaYcz5CysFe/z7Y2oOC9NJeJF0ASPOabUR8yL2F3jyGSGzgj8Eb9cRnKgH5sVi DJE15/eys1ZgnjFdGiXJ/RpBdnLxS1hblZwBNOJjyk8tPbb4Fv+8XIsCiBOJXBIHtBbYh6 2zu4HTakaDN2uw/C0//vNmIJSuaL38DMSY4ddQJiqDInIPFLZOX4G1qIZYgE4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699118309; 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=z/TBliD5KSGlM5P4el2VFUFL1S/56GZbJNqGQOC6uFw=; b=OMjlx6GLaYJZZw5fixIju/5cyVdR9AXXifjpihXG7GG1vW5soykHA/BMpxz71ENug8FQkU 79TsZfjHX0UBXxFhcfSBBKyVee5Aai5wqteRC2zDSKWW8UbYGKMUPzMttLD46xCkvBKbH/ TdSO4ijvYmeFW4ikOWFIEFg+IaANp1Xc/uJdQe66488JWHzwwo0mUmlpVz5178vSvWcq4M BCjwVDRzpGjfozFGLJA4m9h5sXtLoak3G94ikR4r1oPypE7CfE2Dzowt6knGONDNmCeUag 4dHYjBiXbvu8v1crgc8yHNbMXf1gv9qnuiBEP8+sIiGLbEIziGjh9cc+eUbCLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699118309; a=rsa-sha256; cv=none; b=M0z2hU/AoWUYFNq7FStYNLCtZDG2s9SAXG1ngWh3NKDmql04ED4UU0Y0rhJc59jCQPfACX HXgUzzaIYCoVhl+XRldlfGeVOHTjM7Kgr5KUwLpxsU2ZJUb51daw2nJiTblEkCHdT/vlGZ sDb95cZVNO+6RrzTL+ZaeqDyFszumAtyERa9tQ5SiUHS6I6vciinnJc5jgT3Sq0M94XR7Z 0aRVDabaOv0qjJpqd1swkOeBlMnNzzJmaYcu8Hojg+wulN1sQgTYa8mZiAJ7oqKS81AEpG 0DYdN4dG+D1R1qsoDZj4+Xq0GCwHC2DFjwH/GuWQ/ld2cJWksauso7noPz+Mgw== 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 4SN48516Nyz15yb; Sat, 4 Nov 2023 17:18:29 +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 3A4HIT8p004606; Sat, 4 Nov 2023 17:18:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4HITtf004603; Sat, 4 Nov 2023 17:18:29 GMT (envelope-from git) Date: Sat, 4 Nov 2023 17:18:29 GMT Message-Id: <202311041718.3A4HITtf004603@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: 6647af9b56b3 - main - bsd.progs.mk must pass META_XTRAS to gendirdeps.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: 6647af9b56b3998bc6e57c55a2a96115366bd62f Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=6647af9b56b3998bc6e57c55a2a96115366bd62f commit 6647af9b56b3998bc6e57c55a2a96115366bd62f Author: Simon J. Gerraty AuthorDate: 2023-11-04 17:16:33 +0000 Commit: Simon J. Gerraty CommitDate: 2023-11-04 17:17:40 +0000 bsd.progs.mk must pass META_XTRAS to gendirdeps.mk The indirection used by bsd.progs.mk is setting META_XTRAS means the value needs to be passed in the environment to gendirdeps.mk, as any expansion before then will be empty. Remove a now misleading comment from bsd.progs.mk before it includes bsd.prog.mk Update gendirdeps.mk to accommodate this. Reviewed by: stevek --- share/mk/bsd.progs.mk | 3 ++- share/mk/gendirdeps.mk | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 946c44f76570..fba617b12595 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -64,6 +64,8 @@ all: ${PROGS} .endif META_XTRAS+= ${cat ${PROGS:S/$/*.meta_files/} 2>/dev/null || true:L:sh} +# the above does no use unless we pass it on to gendirdeps.mk +GENDIRDEPS_ENV += META_XTRAS='${META_XTRAS}' .if ${MK_STAGING} != "no" && !empty(PROGS) # Stage from parent while respecting PROGNAME and BINDIR overrides. @@ -88,7 +90,6 @@ $v = .endfor .endif -# handle being called [bsd.]progs.mk .include .if !defined(_SKIP_BUILD) diff --git a/share/mk/gendirdeps.mk b/share/mk/gendirdeps.mk index ec4e188cdf78..5d54aa232152 100644 --- a/share/mk/gendirdeps.mk +++ b/share/mk/gendirdeps.mk @@ -1,4 +1,4 @@ -# $Id: gendirdeps.mk,v 1.49 2023/04/20 17:45:03 sjg Exp $ +# $Id: gendirdeps.mk,v 1.50 2023/11/04 16:47:34 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -102,6 +102,10 @@ _DEPENDFILE := ${_CURDIR}/${.MAKE.DEPENDFILE:T} # caller should have set this META_FILES ?= ${.MAKE.META.FILES} +# this sometimes needs to be passed separately +.if !empty(META_XTRAS) +META_FILES += ${META_XTRAS:N\*.meta} +.endif .if !empty(META_FILES)