diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-31 14:53:45 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-31 14:53:45 +0000 |
| commit | 5aa00032dc7a10767089eb691e61016eae36b00b (patch) | |
| tree | 27ff7dc7d8e4c52129404d4958b86d327cfabe90 /mk | |
| parent | 50086541bd59d46c0bd920d13a6131f493a1cc15 (diff) | |
| download | pkgsrc-5aa00032dc7a10767089eb691e61016eae36b00b.tar.gz | |
From the second point in Krister's mail to tech-pkg:
http://mail-index.netbsd.org/tech-pkg/2006/07/30/0005.html
2. Too much is logged in the .wrapper.log
The wrappers log quite a lot of detailed information by
default, with the result that my .work.log file is 176236028
bytes {for ghc}.
The wrapper functionality is mature, so this detailed
information is seldom needed, and you can in general determine
what happened by looking at the input/output-lines (i.e.
those lines marked as "[*]" and "<.>" in the .work.log).
I would therefore like to change the default behavior to
only log the input/output-lines.
Flip the switch for WRAPPER_DEBUG from "yes" to "no" by default so
that the detailed and rather verbose "push", "pop", "transform", etc.
messages are not printed. While here, also make WRAPPER_DEBUG a
pkgsrc-private variable by prepending with an underscore.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index f0824c16db2..7d6ebdec37b 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.51 2006/07/27 13:47:29 jlam Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.52 2006/07/31 14:53:45 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -59,10 +59,10 @@ PREPEND_PATH+= ${WRAPPER_BINDIR} ### .if exists(${_COOKIE.barrier}) -WRAPPER_DEBUG?= yes -CONFIGURE_ENV+= WRAPPER_DEBUG=${WRAPPER_DEBUG:Q} -MAKE_ENV+= WRAPPER_DEBUG=${WRAPPER_DEBUG:Q} -SCRIPTS_ENV+= WRAPPER_DEBUG="${WRAPPER_DEBUG}" +_WRAPPER_DEBUG?= no +CONFIGURE_ENV+= WRAPPER_DEBUG=${_WRAPPER_DEBUG:Q} +MAKE_ENV+= WRAPPER_DEBUG=${_WRAPPER_DEBUG:Q} +SCRIPTS_ENV+= WRAPPER_DEBUG="${_WRAPPER_DEBUG}" # The caching code, which greatly speeds up the build process, doesn't # work correctly on certain platforms. @@ -368,7 +368,7 @@ _WRAP_SUBST_SED.${_wrappee_}= \ -e "s|@_WRAP_SKIP_TRANSFORM@|${_WRAP_SKIP_TRANSFORM.${_wrappee_}:Q}|g" \ -e "s|@_WRAP_TRANSFORM@|${_WRAP_TRANSFORM.${_wrappee_}:Q}|g" \ -e "s|@_WRAP_TRANSFORM_SED@|${_WRAP_TRANSFORM_SED.${_wrappee_}:Q}|g" \ - -e "s|@WRAPPER_DEBUG@|${WRAPPER_DEBUG}|g" \ + -e "s|@WRAPPER_DEBUG@|${_WRAPPER_DEBUG}|g" \ -e "s|@WRAPPER_UPDATE_CACHE@|${WRAPPER_UPDATE_CACHE}|g" \ ${_WRAP_SUBST_SED} @@ -760,7 +760,7 @@ SUBST_STAGE.unwrap= post-build SUBST_MESSAGE.unwrap= Unwrapping files-to-be-installed. SUBST_FILES.unwrap= ${_UNWRAP_FILES} SUBST_SED.unwrap= ${_UNWRAP_SED} -.if defined(WRAPPER_DEBUG) && !empty(WRAPPER_DEBUG:M[yY][eE][sS]) +.if defined(_WRAPPER_DEBUG) && !empty(_WRAPPER_DEBUG:M[yY][eE][sS]) SUBST_POSTCMD.unwrap= ${DO_NADA} .endif |