diff options
| author | rillig <rillig@pkgsrc.org> | 2006-07-15 23:58:52 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-07-15 23:58:52 +0000 |
| commit | afe8d0ecbba7b41d44bbd546dcc94cf128abb8e8 (patch) | |
| tree | a4b93f8fac3a6f560860ad528f5b8c399b8d67b1 /mk/flavor | |
| parent | 1adec57e36c902853772fd4e92e0dc9503277eeb (diff) | |
| download | pkgsrc-afe8d0ecbba7b41d44bbd546dcc94cf128abb8e8.tar.gz | |
Split the variable BUILD_DEFS into those that are defined by packages
and those that are defined by the infrastructure (_BUILD_DEFS). This
allows the build-defs-message target to be moved to the end of
bsd.pkg.mk. Now it prints the correct result even in unprivileged
builds, which had been wrong due to the order in which the files have
been included. For example, ${UNPRIVILEGED_USER} was displayed as (not
defined) although its value was defined, which could be checked with
"bmake show-var".
Tested with one package that _does_ define BUILD_DEFS and with one that
doesn't. The behavior stays the same.
Diffstat (limited to 'mk/flavor')
| -rw-r--r-- | mk/flavor/pkg/metadata.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk index 2f207fb5e13..256fd8b0771 100644 --- a/mk/flavor/pkg/metadata.mk +++ b/mk/flavor/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.7 2006/07/07 21:24:28 jlam Exp $ +# $NetBSD: metadata.mk,v 1.8 2006/07/15 23:58:52 rillig Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -26,7 +26,7 @@ _METADATA_TARGETS+= ${_BUILD_INFO_FILE} ${_BUILD_INFO_FILE}: plist ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp -.for _def_ in ${BUILD_DEFS} +.for _def_ in ${_BUILD_DEFS} ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${_def_}=${${_def_}:Q} | \ ${SED} -e 's|^PATH=[^ ]*|PATH=...|' \ >> ${.TARGET}.tmp |