summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2004-06-05 09:10:41 +0000
committeragc <agc@pkgsrc.org>2004-06-05 09:10:41 +0000
commitfb05638837884b2db673ebaa0c91260cd973c188 (patch)
tree8d2d9e060cadedb533bf438267914cd789b445fe /mk
parentab6746c38132bf52c30da01b9710c9d4cff76ebd (diff)
downloadpkgsrc-fb05638837884b2db673ebaa0c91260cd973c188.tar.gz
When building a pre-requisite package, exit if the build of the
pre-req fails. Fixes an error noticed by Kimmo and others, where a build would blindly continue even if the pre-requsite package wasn't built correctly, and is fallout from the "sh -e" and make(1) changes in NetBSD-current.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 2647f46cb72..fccdf31229b 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1467 2004/06/04 15:00:14 jschauma Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1468 2004/06/05 09:10:41 agc Exp $
#
# This file is in the public domain.
#
@@ -3980,7 +3980,7 @@ install-depends: uptodate-pkgtools
${ECHO_MSG} "=> No directory for $$dir. Skipping.."; \
else \
cd $$dir ; \
- ${SETENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" ${MAKE} ${MAKEFLAGS} $$target PKGNAME_REQD=\'$$pkg\'; \
+ ${SETENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" ${MAKE} ${MAKEFLAGS} $$target PKGNAME_REQD=\'$$pkg\' || exit 1; \
${ECHO_MSG} "${_PKGSRC_IN}> Returning to build of ${PKGNAME}"; \
fi; \
fi