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 | |
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.
-rw-r--r-- | mk/bsd.pkg.mk | 34 | ||||
-rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 | ||||
-rw-r--r-- | mk/emacs.mk | 6 | ||||
-rw-r--r-- | mk/pthread.buildlink.mk | 10 | ||||
-rw-r--r-- | mk/pthread.buildlink2.mk | 10 |
5 files changed, 32 insertions, 32 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 571de776103..166a4adf811 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1101 2002/12/05 05:41:39 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1102 2002/12/07 02:37:56 schmonz Exp $ # # This file is in the public domain. # @@ -174,7 +174,7 @@ PREFIX= ${LOCALBASE} .if defined(USE_IMAKE) . if exists(${LOCALBASE}/lib/X11/config/buildlinkX11.def) || \ exists(${X11BASE}/lib/X11/config/buildlinkX11.def) -IGNORE+= "${PKGNAME} uses imake, but the buildlink-x11 package was found." \ +PKG_FAIL_REASON+= "${PKGNAME} uses imake, but the buildlink-x11 package was found." \ " Please deinstall it (pkg_delete buildlink-x11)." . endif .endif # USE_IMAKE @@ -1053,27 +1053,27 @@ ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES} .if !defined(NO_IGNORE) . if (defined(NO_BIN_ON_CDROM) && defined(FOR_CDROM)) -IGNORE+= "${PKGNAME} may not be placed in binary form on a CDROM:" \ +PKG_FAIL_REASON+= "${PKGNAME} may not be placed in binary form on a CDROM:" \ " "${NO_BIN_ON_CDROM:Q} . endif . if (defined(NO_SRC_ON_CDROM) && defined(FOR_CDROM)) -IGNORE+= "${PKGNAME} may not be placed in source form on a CDROM:" \ +PKG_FAIL_REASON+= "${PKGNAME} may not be placed in source form on a CDROM:" \ " "${NO_SRC_ON_CDROM:Q} . endif . if (defined(RESTRICTED) && defined(NO_RESTRICTED)) -IGNORE+= "${PKGNAME} is restricted:" \ +PKG_FAIL_REASON+= "${PKGNAME} is restricted:" \ " "${RESTRICTED:Q} . endif . if !(${MKCRYPTO} == "YES" || ${MKCRYPTO} == yes) . if defined(CRYPTO) -IGNORE+= "${PKGNAME} may not be built, because it utilizes strong cryptography" +PKG_FAIL_REASON+= "${PKGNAME} may not be built, because it utilizes strong cryptography" . endif . endif . if defined(USE_X11) && !exists(${X11BASE}) -IGNORE+= "${PKGNAME} uses X11, but ${X11BASE} not found" +PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found" . endif . if defined(BROKEN) -IGNORE+= "${PKGNAME} is marked as broken:" ${BROKEN:Q} +PKG_FAIL_REASON+= "${PKGNAME} is marked as broken:" ${BROKEN:Q} . endif . if defined(LICENSE) @@ -1085,7 +1085,7 @@ _ACCEPTABLE= yes . endfor # _lic . endif # ACCEPTABLE_LICENSES . ifndef _ACCEPTABLE -IGNORE+= "${PKGNAME} has an unacceptable license: ${LICENSE}." \ +PKG_FAIL_REASON+= "${PKGNAME} has an unacceptable license: ${LICENSE}." \ " To build this package, add this line to your /etc/mk.conf:" \ " ACCEPTABLE_LICENSES+=${LICENSE}" . endif # _ACCEPTABLE @@ -1107,25 +1107,25 @@ __PLATFORM_OK?= yes . endif # MACHINE_PLATFORM . endfor # __tmp__ . if !defined(__PLATFORM_OK) -IGNORE+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}" +PKG_FAIL_REASON+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}" . endif # !__PLATFORM_OK # # Now print some error messages that we know we should ignore the pkg # -. if defined(IGNORE) +. if defined(PKG_FAIL_REASON) || defined(PKG_SKIP_REASON) fetch checksum extract patch configure all build install package \ update install-depends: . if defined(IGNORE_SILENT) @${DO_NADA} . else - @for str in ${IGNORE} ; \ + @for str in ${PKG_FAIL_REASON} ${PKG_SKIP_REASON} ; \ do \ ${ECHO} "${_PKGSRC_IN}> $$str" ; \ done . endif -. if defined(IGNORE_FAIL) - ${FALSE} +. if defined(PKG_FAIL_REASON) + @${FALSE} . endif . endif # IGNORE .endif # !NO_IGNORE @@ -1477,7 +1477,7 @@ show-root-dirs: .if !target(show-distfiles) show-distfiles: -. if defined(IGNORE) +. if defined(PKG_FAIL_REASON) ${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA} . else ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -1490,7 +1490,7 @@ show-distfiles: .if !target(show-downlevel) show-downlevel: -. if defined(IGNORE) +. if defined(PKG_FAIL_REASON) ${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA} . else ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -1517,7 +1517,7 @@ show-installed-depends: .if !target(show-pkgsrc-dir) show-pkgsrc-dir: -. if defined(IGNORE) +. if defined(PKG_FAIL_REASON) ${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA} . else ${_PKG_SILENT}${_PKG_DEBUG} \ 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};\ diff --git a/mk/emacs.mk b/mk/emacs.mk index 638eca9a9b5..fadccf52c27 100644 --- a/mk/emacs.mk +++ b/mk/emacs.mk @@ -1,4 +1,4 @@ -# $NetBSD: emacs.mk,v 1.7 2002/11/27 09:13:47 uebayasi Exp $ +# $NetBSD: emacs.mk,v 1.8 2002/12/07 02:37:57 schmonz Exp $ # # A Makefile fragment for Emacs Lisp packages. # @@ -133,8 +133,8 @@ FOR.xemacs215= "" EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.xemacs211}:../../editors/xemacs FOR.xemacs211= "" .else -IGNORE+= "Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}" -IGNORE+= "No valid Emacs version installed found" +PKG_FAIL_REASON+= "Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}" +PKG_FAIL_REASON+= "No valid Emacs version installed found" .endif .if defined(EMACS_FOR_BUILD_ONLY) BUILD_DEPENDS+= ${EMACS_DEPENDENCY} diff --git a/mk/pthread.buildlink.mk b/mk/pthread.buildlink.mk index fbbc918e432..e61fca50b5b 100644 --- a/mk/pthread.buildlink.mk +++ b/mk/pthread.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: pthread.buildlink.mk,v 1.12 2002/11/01 06:09:36 jlam Exp $ +# $NetBSD: pthread.buildlink.mk,v 1.13 2002/12/07 02:37:57 schmonz Exp $ # # The pthreads strategy for pkgsrc is to "bless" a particular pthread # package as the Official Pthread Replacement (OPR). A package that uses @@ -42,7 +42,7 @@ # (3) Add "require" to PTHREAD_OPTS prior to including # pthread.buildlink.mk. This will make the package use the native # pthread library or else use the OPR package, and will otherwise set -# IGNORE if neither can be used, e.g., +# PKG_FAIL_REASON if neither can be used, e.g., # # PTHREAD_OPTS+= require # # @@ -122,7 +122,7 @@ PTHREAD_TYPE= native . if !empty(PTHREAD_OPTS:Mnative) PTHREAD_TYPE= none . if !empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional) -IGNORE= "${PKGNAME} requires a native pthreads implementation." +PKG_FAIL_REASON= "${PKGNAME} requires a native pthreads implementation." . endif . else PTHREAD_TYPE= none @@ -133,7 +133,7 @@ PTHREAD_TYPE= ${_PKG_PTHREAD} . endfor . if (${PTHREAD_TYPE} == "none") && \ !empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional) -IGNORE= "${PKGNAME} requires a working pthreads implementation." +PKG_FAIL_REASON= "${PKGNAME} requires a working pthreads implementation." . endif . endif .endif @@ -163,7 +163,7 @@ DEPENDS+= ${_PKG_PTHREAD_DEPENDS}:${_PKG_PTHREAD_PKGSRCDIR} . endif . include "${_PKG_PTHREAD_BUILDLINK_MK}" . else -IGNORE= "${PKGNAME} needs pthreads, but ${_PKG_PTHREAD_BUILDLINK_MK} is missing." +PKG_FAIL_REASON= "${PKGNAME} needs pthreads, but ${_PKG_PTHREAD_BUILDLINK_MK} is missing." . endif .endif diff --git a/mk/pthread.buildlink2.mk b/mk/pthread.buildlink2.mk index bc2c6967b0d..93489920692 100644 --- a/mk/pthread.buildlink2.mk +++ b/mk/pthread.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: pthread.buildlink2.mk,v 1.5 2002/11/01 06:09:36 jlam Exp $ +# $NetBSD: pthread.buildlink2.mk,v 1.6 2002/12/07 02:37:57 schmonz Exp $ # # The pthreads strategy for pkgsrc is to "bless" a particular pthread # package as the Official Pthread Replacement (OPR). A package that uses @@ -42,7 +42,7 @@ # (3) Add "require" to PTHREAD_OPTS prior to including # pthread.buildlink2.mk. This will make the package use the native # pthread library or else use the OPR package, and will otherwise set -# IGNORE if neither can be used, e.g., +# PKG_FAIL_REASON if neither can be used, e.g., # # PTHREAD_OPTS+= require # # @@ -122,7 +122,7 @@ PTHREAD_TYPE= native . if !empty(PTHREAD_OPTS:Mnative) PTHREAD_TYPE= none . if !empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional) -IGNORE= "${PKGNAME} requires a native pthreads implementation." +PKG_FAIL_REASON= "${PKGNAME} requires a native pthreads implementation." . endif . else PTHREAD_TYPE= none @@ -133,7 +133,7 @@ PTHREAD_TYPE= ${_PKG_PTHREAD} . endfor . if (${PTHREAD_TYPE} == "none") && \ !empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional) -IGNORE= "${PKGNAME} requires a working pthreads implementation." +PKG_FAIL_REASON= "${PKGNAME} requires a working pthreads implementation." . endif . endif .endif @@ -161,7 +161,7 @@ BUILDLINK_DEPENDS.${_PKG_PTHREAD}= ${_PKG_PTHREAD_DEPENDS} BUILDLINK_PREFIX.pthread= ${BUILDLINK_PREFIX.${_PKG_PTHREAD}} . include "${_PKG_PTHREAD_BUILDLINK2_MK}" . else -IGNORE= "${PKGNAME} needs pthreads, but ${_PKG_PTHREAD_BUILDLINK2_MK} is missing." +PKG_FAIL_REASON= "${PKGNAME} needs pthreads, but ${_PKG_PTHREAD_BUILDLINK2_MK} is missing." . endif .endif |