diff options
| author | schmonz <schmonz> | 2002-12-07 02:37:56 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2002-12-07 02:37:56 +0000 |
| commit | 871498add4080b3a349768e215c1d64a2acbefc0 (patch) | |
| tree | 9f9d7b468f453822a47bbad27f95a7fea151c8bd /mk/bulk | |
| parent | 514a02749c1d1a4bba8c32603688842be692d325 (diff) | |
| download | pkgsrc-871498add4080b3a349768e215c1d64a2acbefc0.tar.gz | |
Replace IGNORE into PKG_FAIL_REASON and PKG_SKIP_REASON, so pkgsrc
can stop builds when a dependency is broken, yet continue builds
when a dependency is merely skipped (usually because it duplicates
functionality in the base system). Thus IGNORE_FAIL, the
oft-misunderstood and naught-documented option, goes away.
This addresses many people's complaints on tech-pkg@ and other
lists, as well as PR pkg/18157.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 234815d3310..590fc9c92e4 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.40 2002/08/22 08:21:30 jlam Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.41 2002/12/07 02:37:58 schmonz Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -324,7 +324,7 @@ bulk-package: if [ -z "$$pkgname" ]; then pkgname=unknown ; fi ; \ ${ECHO_MSG} "BULK> marking package that requires ${PKGNAME} as broken: $$pkgname ($$pkgdir)";\ pkgerr="-1"; \ - pkgignore=`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=IGNORE)`; \ + pkgignore=`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_FAIL_REASON)`; \ if [ ! -z "$$pkgignore" -a ! -f ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \ ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) may not be packaged because:" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ ${ECHO_MSG} "BULK> $$pkgignore" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ |