diff options
| author | jlam <jlam> | 2006-06-09 13:59:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-06-09 13:59:06 +0000 |
| commit | 2de1e440d8b26a98a76f16e73d38e67e4d8c0c49 (patch) | |
| tree | bc3ee1d8414671473ac53f6468293fea0563cf1d /mk/bsd.pkg.mk | |
| parent | f968cd192d9c619aaa9fb72626c3f892e34c6209 (diff) | |
| download | pkgsrc-2de1e440d8b26a98a76f16e73d38e67e4d8c0c49.tar.gz | |
Introduce the capability to gather all the warnings and errors that
are generated for a target and output them all at once at the conclusion
of the target's invocation. The implementation is in bsd.pkg.error.mk,
which defines a macro target "error-check" that will print out any
non-empty warning and error files in ${WARNING_DIR} and ${ERROR_DIR}
and exit appropriately if there were errors.
Convert some targets that were just long sequences of ${ERROR_MSG} or
${WARNING_MSG} within a single shell statement to use the new delayed
error output via error-check.
Modify the compiler "fail" wrappers for C++ and Fortran to be less
verbose during invocation. Instead collect the warnings and only
print them at the end of the completed phase, e.g. after "configure"
and/or "build" completes.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 955ee206169..35d5c6b34a4 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1848 2006/06/08 16:21:51 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1849 2006/06/09 13:59:06 jlam Exp $ # # This file is in the public domain. # @@ -27,6 +27,7 @@ .include "${PKGSRCDIR}/mk/extract/bsd.extract-vars.mk" .include "${PKGSRCDIR}/mk/patch/bsd.patch-vars.mk" .include "${PKGSRCDIR}/mk/install/bsd.install-vars.mk" +.include "${PKGSRCDIR}/mk/bsd.pkg.error.mk" .include "../../mk/bsd.hacks.mk" @@ -311,7 +312,7 @@ _WRAPPER_COOKIE= ${WRKDIR}/.wrapper_done _CONFIGURE_COOKIE= ${WRKDIR}/.configure_done _BUILD_COOKIE= ${WRKDIR}/.build_done _TEST_COOKIE= ${WRKDIR}/.test_done -_INTERACTIVE_COOKIE= .interactive_stage +_INTERACTIVE_COOKIE= ${.CURDIR}/.interactive_stage _NULL_COOKIE= ${WRKDIR}/.null # Miscellaneous overridable commands: @@ -1319,10 +1320,10 @@ test-cookie: # make i.e. without -j n) .PHONY: real-wrapper .PHONY: real-configure real-build real-test -real-wrapper: wrapper-message wrapper-vars pre-wrapper do-wrapper post-wrapper wrapper-cookie -real-configure: configure-message configure-vars pre-configure pre-configure-override do-configure post-configure configure-cookie -real-build: build-message build-vars pre-build do-build post-build build-cookie -real-test: test-message pre-test do-test post-test test-cookie +real-wrapper: wrapper-message wrapper-vars pre-wrapper do-wrapper post-wrapper wrapper-cookie error-check +real-configure: configure-message configure-vars pre-configure pre-configure-override do-configure post-configure configure-cookie error-check +real-build: build-message build-vars pre-build do-build post-build build-cookie error-check +real-test: test-message pre-test do-test post-test test-cookie error-check # su-target is a macro target that does just-in-time su-to-root before # reinvoking the make process as root. It acquires root privileges and |