diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2023-11-04 17:16:33 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2023-11-04 17:17:40 +0000 |
| commit | 6647af9b56b3998bc6e57c55a2a96115366bd62f (patch) | |
| tree | c8d211517c4869dfbd292a5f3b3dbc75de4dccd2 | |
| parent | 586fed0b03561558644eccc37f824c7110500182 (diff) | |
| download | src-6647af9b56b3998bc6e57c55a2a96115366bd62f.tar.gz src-6647af9b56b3998bc6e57c55a2a96115366bd62f.zip | |
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
| -rw-r--r-- | share/mk/bsd.progs.mk | 3 | ||||
| -rw-r--r-- | 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 <bsd.prog.mk> .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) |