[pkgsrc/trunk]: pkgsrc/mk Added a call similar to "make error-check" when the...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/313d633a9647
branches:  trunk
changeset: 519607:313d633a9647
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Oct 06 19:04:37 2006 +0000

description:
Added a call similar to "make error-check" when the real target fails
for some reason. That way, error and warning messages that have long
been hidden are now shown. They don't appear very prominently by now,
but it's much better than showing them not at all.

diffstat:

 mk/bsd.pkg.barrier.mk |  16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r 90749340762c -r 313d633a9647 mk/bsd.pkg.barrier.mk
--- a/mk/bsd.pkg.barrier.mk     Fri Oct 06 18:58:55 2006 +0000
+++ b/mk/bsd.pkg.barrier.mk     Fri Oct 06 19:04:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.11 2006/07/27 21:46:45 jlam Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.12 2006/10/06 19:04:37 rillig Exp $
 
 _COOKIE.barrier=       ${WRKDIR}/.barrier_cookie
 
@@ -12,6 +12,8 @@
 #      ordered so that if more than one is specified on the command-line,
 #      then pkgsrc will still do the right thing.
 #
+
+# FIXME: why is wrapper before extract?
 _BARRIER_POST_TARGETS= tools
 _BARRIER_POST_TARGETS+=        wrapper
 _BARRIER_POST_TARGETS+=        extract
@@ -51,13 +53,23 @@
 ### targets that occur before the barrier.
 ###
 
+.PHONY: barrier-error-check
+barrier-error-check: error-check
+
 .PHONY: barrier
 barrier: ${_BARRIER_PRE_TARGETS} ${_COOKIE.barrier}
 .if !defined(_PKGSRC_BARRIER)
 .  if defined(PKG_VERBOSE)
        @${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
 .  endif
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${RECURSIVE_MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS}
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       cd ${.CURDIR}                                                   \
+       && ${RECURSIVE_MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} \
+       || {                                                            \
+               exitcode="$$?";                                         \
+               ${RECURSIVE_MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes barrier-error-check; \
+               exit "$$exitcode";                                      \
+       }
 .  if defined(PKG_VERBOSE)
        @${PHASE_MSG} "Leaving \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
 .  endif