diff options
| author | agc <agc@pkgsrc.org> | 2000-01-14 11:58:21 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-01-14 11:58:21 +0000 |
| commit | 1a2b11032482615a9139c5f2e107724a8050dae4 (patch) | |
| tree | dabf39394977ab01deb5371d8d9d4a084eb59ca9 /mk | |
| parent | 003906a9b85120593c9923fbea1a1af69b78b746 (diff) | |
| download | pkgsrc-1a2b11032482615a9139c5f2e107724a8050dae4.tar.gz | |
Introduce another definition, FATAL_OBJECT_FMT_SKEW, defaulting to "yes".
This halts the execution if an installed package's object format is not
the same as the object format currently in use. It can be set to "no" on
the rare occasion where the interface to the pre-requisite packages is one
of a binary, not a library.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 | ||||
| -rw-r--r-- | mk/mk.conf.example | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b94bd3d206d..fd03e3d14e6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.392 2000/01/14 11:39:31 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.393 2000/01/14 11:58:21 agc Exp $ # # This file is in the public domain. # @@ -2186,6 +2186,9 @@ _DEPENDS_USE: @${DO_NADA} .endif +# Tells whether to halt execution if the object formats differ +FATAL_OBJECT_FMT_SKEW?= yes + fetch-depends: _DEPENDS_USE build-depends: _DEPENDS_USE run-depends: _DEPENDS_USE @@ -2205,7 +2208,9 @@ misc-depends: uptodate-pkgtools ${ECHO} "Installed package $$package is an $$instobjfmt package."; \ ${ECHO} "You are building an ${OBJECT_FMT} package, which will not inter-operate."; \ ${ECHO} "Please update the $$package package to ${OBJECT_FMT}"; \ - exit 1; \ + if [ "X${FATAL_OBJECT_FMT_SKEW}" != "no" ]; then \ + exit 1; \ + fi; \ fi; \ if [ `${ECHO} $$found | wc -w` -gt 1 ]; then \ ${ECHO} '***' "WARNING: Dependency on '$$package' expands to several installed packages " ; \ diff --git a/mk/mk.conf.example b/mk/mk.conf.example index b8a00026a13..3b8e2d7f14a 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.111 2000/01/06 08:48:52 fredb Exp $ +# $NetBSD: mk.conf.example,v 1.112 2000/01/14 11:58:22 agc Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values @@ -198,6 +198,14 @@ # Possible: su, sudo, or priv, with appropriate arguments # Default: ${SU} - root -c +#FATAL_OBJECT_FMT_SKEW=yes +# If there is a pre-requisite package, which has a different object format +# from that currently being used, halt execution. One (rare) situation where +# it is possible for the difference to be harmless is where the pre-requisite +# package provides an executable, not a library. +# Possible: yes, no +# Default: yes + # # Definitions used only in the packages collection # |