pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk When building a pre-requisite package, exit if the ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/55a66e5f57e9
branches:  trunk
changeset: 476202:55a66e5f57e9
user:      agc <agc%pkgsrc.org@localhost>
date:      Sat Jun 05 09:10:41 2004 +0000

description:
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:

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

diffs (18 lines):

diff -r 5c35930b6f7f -r 55a66e5f57e9 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Jun 05 07:47:37 2004 +0000
+++ b/mk/bsd.pkg.mk     Sat Jun 05 09:10:41 2004 +0000
@@ -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 @@
                        ${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



Home | Main Index | Thread Index | Old Index