diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2026-06-21 19:19:29 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2026-06-21 19:19:29 +0000 |
| commit | c37839dc7b6a4d5f2c4d5bddda6595782a83dae4 (patch) | |
| tree | 1f3769aa8ec6735953dab2c081e880a9d48fb159 | |
| parent | 704db3fe9840ee3e51b080b7c35defd1a74c0c2d (diff) | |
meta.autodep.mk remove extra }
remove extra } from GENDIRDEPS_ENV
more debug output for gendirdeps.mk
Reviewed by: stevek
Differential Revision: https://reviews.freebsd.org/D57727
| -rw-r--r-- | share/mk/gendirdeps.mk | 14 | ||||
| -rw-r--r-- | share/mk/meta.autodep.mk | 6 |
2 files changed, 14 insertions, 6 deletions
diff --git a/share/mk/gendirdeps.mk b/share/mk/gendirdeps.mk index e5f536441a8d..ad964e062205 100644 --- a/share/mk/gendirdeps.mk +++ b/share/mk/gendirdeps.mk @@ -1,4 +1,4 @@ -# $Id: gendirdeps.mk,v 1.56 2026/06/19 18:57:57 sjg Exp $ +# $Id: gendirdeps.mk,v 1.57 2026/06/21 19:04:57 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -163,10 +163,12 @@ META2DEPS := ${META2DEPS} .if ${_debug.gendirdeps} && ${DEBUG_GENDIRDEPS:Mmeta2d*} != "" _time = time +_set_x = set -x; _sh_x = sh -x _py_d = -ddd .else _time = +_set_x = _sh_x = _py_d = .endif @@ -244,7 +246,11 @@ x != echo; for m in $$_meta_files; do echo $$m; done > meta.list _meta_files_arg:= ${_meta_files} .endif -dir_list != cd ${_OBJDIR} && \ +.if ${_debug.gendirdeps} +.info ${RELDIR}: _meta_files_arg='${_meta_files_arg}' +.endif + +dir_list != cd ${_OBJDIR} && ${_set_x} \ ${META2DEPS_CMD} MACHINE=${MACHINE} \ SRCTOP=${SRCTOP} RELDIR=${RELDIR} CURDIR=${_CURDIR} \ ${META2DEPS_ARGS} \ @@ -256,6 +262,9 @@ dir_list != cd ${_OBJDIR} && \ .warning Skipping ${_DEPENDFILE:S,${SRCTOP}/,,} # we are not going to update anything .else +.if ${_debug.gendirdeps} +.info ${RELDIR}: raw_dir_list='${dir_list}' +.endif dpadd_dir_list= .if !empty(DPADD) _nonlibs := ${DPADD:T:Nlib*:N*include} @@ -276,7 +285,6 @@ ddeps != cat ${ddep_list:O:u} | ${META2DEPS_FILTER} ${_skip_gendirdeps} \ sed ${GENDIRDEPS_SEDCMDS} .if ${_debug.gendirdeps} -.info ${RELDIR}: raw_dir_list='${dir_list}' .info ${RELDIR}: ddeps='${ddeps}' .endif dir_list += ${ddeps} diff --git a/share/mk/meta.autodep.mk b/share/mk/meta.autodep.mk index 2120c0892475..a4d43f19fec1 100644 --- a/share/mk/meta.autodep.mk +++ b/share/mk/meta.autodep.mk @@ -1,4 +1,4 @@ -# $Id: meta.autodep.mk,v 1.71 2025/08/09 22:42:24 sjg Exp $ +# $Id: meta.autodep.mk,v 1.73 2026/06/21 19:01:21 sjg Exp $ # # @(#) Copyright (c) 2010-2025, Simon J. Gerraty # @@ -275,7 +275,7 @@ META_FILES = ${.MAKE.META.FILES:N.depend*} # objects in subdirs META_FILE_FILTER += S,${_OBJDIR}/,,:O:u # we have to defer evaluation until the target script runs -GENDIRDEPS_ENV += META_FILES="${META_FILES:${META_FILE_FILTER:O:u:ts:}}}" +GENDIRDEPS_ENV += META_FILES="${META_FILES:${META_FILE_FILTER:O:u:ts:}}" .if ${_debug.autodep} .info ${_DEPENDFILE:S,${SRCTOP}/,,}: ${_depend} ${.PARSEDIR}/gendirdeps.mk ${META2DEPS} xtras=${META_XTRAS} @@ -305,7 +305,7 @@ GENDIRDEPS_ENV += MAKESYSPATH=${_makesyspath} GENDIRDEPS_ENV += MAKESYSPATH=${.SYSPATH:ts:} .endif -${_DEPENDFILE}: ${_depend} ${.PARSEDIR}/gendirdeps.mk ${META2DEPS} $${.MAKE.META.CREATED} +${_DEPENDFILE}: .NOMETA ${_depend} ${.PARSEDIR}/gendirdeps.mk ${META2DEPS} $${.MAKE.META.CREATED} @echo Checking $@: ${.OODATE:T:[1..8]} @(cd . && ${GENDIRDEPS_ENV} \ SKIP_GENDIRDEPS='${SKIP_GENDIRDEPS:O:u}' \ |