diff options
| author | agc <agc> | 2000-01-17 14:49:55 +0000 |
|---|---|---|
| committer | agc <agc> | 2000-01-17 14:49:55 +0000 |
| commit | 3363384157c97f943e16e441847d92dc8abe52a8 (patch) | |
| tree | 282097dad4b2ecba33f1f04196cebc9adf370c2b | |
| parent | 36cad3e3bbafcf65419c8fe0a685bc3ba7c5bb37 (diff) | |
| download | pkgsrc-3363384157c97f943e16e441847d92dc8abe52a8.tar.gz | |
Introduce another definition WARN_NO_OBJECT_FMT, defaulting to yes, which
governs whether a package which was installed before OBJECT_FMT was added
to the BUILD_DEFS will display an warning message. To shut up the message,
set WARN_NO_OBJECT_FMT to "no".
| -rw-r--r-- | mk/bsd.pkg.mk | 7 | ||||
| -rw-r--r-- | mk/mk.conf.example | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 1953cdb7626..3a671a9ad06 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.395 2000/01/17 14:33:46 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.396 2000/01/17 14:49:55 agc Exp $ # # This file is in the public domain. # @@ -2193,6 +2193,7 @@ _DEPENDS_USE: # Tells whether to halt execution if the object formats differ FATAL_OBJECT_FMT_SKEW?= yes +WARN_NO_OBJECT_FMT?= yes fetch-depends: _DEPENDS_USE build-depends: _DEPENDS_USE @@ -2208,7 +2209,9 @@ misc-depends: uptodate-pkgtools if [ "X$$found" != "X" ]; then \ instobjfmt=`${PKG_INFO} -B "$$package" | ${AWK} '/^OBJECT_FMT/ { print $$2 }'`; \ if [ "X$$instobjfmt" = "X" ]; then \ - ${ECHO} "WARNING: Unknown object format for installed package $$package - continuing"; \ + if [ "X${WARN_NO_OBJECT_FMT}" != "Xno" ]; then \ + ${ECHO} "WARNING: Unknown object format for installed package $$package - continuing"; \ + fi; \ elif [ "X$$instobjfmt" != "X${OBJECT_FMT}" ]; then \ ${ECHO} "Installed package $$package is an $$instobjfmt package."; \ ${ECHO} "You are building an ${OBJECT_FMT} package, which will not inter-operate."; \ diff --git a/mk/mk.conf.example b/mk/mk.conf.example index 824e93f1879..7a978d10acb 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.114 2000/01/15 12:22:30 ad Exp $ +# $NetBSD: mk.conf.example,v 1.115 2000/01/17 14:49:55 agc Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values @@ -206,6 +206,14 @@ # Possible: yes, no # Default: yes +#WARN_NO_OBJECT_FMT=yes +# Packages installed on a machine before OBJECT_FMT was added to the +# BUILD_DEFS definitions (on 29th September 1999) cannot say which +# object format they are in. This will cause a warning to be displayed. +# Set this to "no" to stop the warning message being shown. +# Possible: yes, no +# Default: yes + # # Definitions used only in the packages collection # |