Get rid of an abstraction violation which has been in the tree since

March 2008. Not vital, but the previous way does not scale well/at all.

16 files changed, 47 insertions, 17 deletions

diff --git a/mk/check/bsd.check-vars.mk b/mk/check/bsd.check-vars.mk
index a5dab08256c..4dfadc74ef7 100644
--- a/mk/check/bsd.check-vars.mk
+++ b/mk/check/bsd.check-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.check-vars.mk,v 1.6 2008/05/13 11:40:24 tnn Exp $
+# $NetBSD: bsd.check-vars.mk,v 1.7 2009/07/26 05:32:43 agc Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -8,7 +8,7 @@
 CHECK_FILES_SUPPORTED?=		yes
 CHECK_SHLIBS_SUPPORTED?=	yes
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
+.if ${_OPSYS_CAN_CHECK_SHLIBS} == "yes"
 USE_CHECK_SHLIBS_ELF?=		yes
 .else
 USE_CHECK_SHLIBS_ELF?=		no
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index ff5d57e8a19..37ea528587c 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.33 2008/10/30 18:52:08 joerg Exp $
+# $NetBSD: AIX.mk,v 1.34 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -70,6 +70,8 @@ DEFAULT_SERIAL_DEVICE?=	/dev/tty0
 SERIAL_DEVICES?=	/dev/tty0 \
 			/dev/tty
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 8726c80bf79..a9f432dd360 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.26 2008/09/22 17:11:02 ahoka Exp $
+# $NetBSD: BSDOS.mk,v 1.27 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -76,6 +76,8 @@ _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 SERIAL_DEVICES?=	/dev/null
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 PKG_CREATE_USERGROUP=	NO # until it works
 
 # check for maximum command line length and set it in configure's environment,
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 9c0ad00ae89..87bc90af417 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.39 2009/07/11 10:32:41 tron Exp $
+# $NetBSD: Darwin.mk,v 1.40 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -100,6 +100,8 @@ _USE_RPATH=		no	# don't add rpath to LDFLAGS
 _OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 487774203cd..164de12034e 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.36 2008/03/04 06:45:34 jlam Exp $
+# $NetBSD: DragonFly.mk,v 1.37 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -75,6 +75,8 @@ _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 DEFAULT_SERIAL_DEVICE?=	/dev/cuaa0
 SERIAL_DEVICES?=	/dev/cuaa0
 
+_OPSYS_CAN_CHECK_SHLIBS=	yes # use readelf in check/bsd.check-vars.mk
+
 # check for kqueue(2) support
 .if exists(/usr/include/sys/event.h)
 PKG_HAVE_KQUEUE=	# defined
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 96734884e52..718afe1a4ee 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.25 2008/05/13 11:40:24 tnn Exp $
+# $NetBSD: FreeBSD.mk,v 1.26 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -82,6 +82,8 @@ SERIAL_DEVICES?=	/dev/cuaa0
 PKG_HAVE_KQUEUE=	# defined
 .endif
 
+_OPSYS_CAN_CHECK_SHLIBS=	yes # use readelf in check/bsd.check-vars.mk
+
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
diff --git a/mk/platform/FreeMiNT.mk b/mk/platform/FreeMiNT.mk
index 449af31c335..1ed36b87ce1 100644
--- a/mk/platform/FreeMiNT.mk
+++ b/mk/platform/FreeMiNT.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeMiNT.mk,v 1.1 2009/03/05 00:02:44 abs Exp $
+# $NetBSD: FreeMiNT.mk,v 1.2 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the FreeMiNT operating system.
 
@@ -37,3 +37,5 @@ _PATCH_BACKUP_ARG?=	-b -V simple -z	# switch to patch(1) for backup suffix
 
 DEFAULT_SERIAL_DEVICE?=	/dev/modem1
 SERIAL_DEVICES?=	/dev/modem1 
+
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
diff --git a/mk/platform/HPUX.mk b/mk/platform/HPUX.mk
index 09533ba20b3..e3abcc0fcb7 100644
--- a/mk/platform/HPUX.mk
+++ b/mk/platform/HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: HPUX.mk,v 1.17 2009/03/17 17:58:49 tnn Exp $
+# $NetBSD: HPUX.mk,v 1.18 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the HP-UX operating system.
 
@@ -75,6 +75,8 @@ SERIAL_DEVICES?=	/dev/tty0p0 \
 
 _INCOMPAT_ICONV=   HPUX-*-*
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 # sysutils/fam is not usable on HP-UX.
 FAM_DEFAULT?=		gamin
 
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index fc2f334ac78..525dc5631f9 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.34 2008/03/04 06:45:34 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.35 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -105,6 +105,8 @@ MAKE_ENV+=		ABI=${ABI:Q}
 
 LIBABISUFFIX?=		${ABI}
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/usr/sbin/sysconf ARG_MAX
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index e07532e63e1..fea742cfd99 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.61 2009/06/02 14:51:03 joerg Exp $
+# $NetBSD: Interix.mk,v 1.62 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -149,6 +149,8 @@ _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 DEFAULT_SERIAL_DEVICE?=	/dev/tty00
 SERIAL_DEVICES?=	/dev/tty00 /dev/tty01 /dev/tty02 /dev/tty03
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 # poll(2) is broken; try to work around it by making autoconf believe
 # it's missing.  (Packages without autoconf will need explicit fixing.)
 CONFIGURE_ENV+=		${GNU_CONFIGURE:Dac_cv_header_poll_h=no ac_cv_func_poll=no}
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 3322244052e..7ae327921ac 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.33 2008/03/04 06:45:34 jlam Exp $
+# $NetBSD: Linux.mk,v 1.34 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -76,6 +76,8 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index b55ff8abe84..75edeb5eb90 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.31 2008/08/10 17:40:00 joerg Exp $
+# $NetBSD: NetBSD.mk,v 1.32 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -142,6 +142,8 @@ FFLAGS+=	-mieee
 PKG_HAVE_KQUEUE=	# defined
 .endif
 
+_OPSYS_CAN_CHECK_SHLIBS=	yes # use readelf in check/bsd.check-vars.mk
+
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index e95211c7d1c..7f7750ddc68 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.27 2009/03/17 17:58:49 tnn Exp $
+# $NetBSD: OSF1.mk,v 1.28 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -69,6 +69,8 @@ SERIAL_DEVICES?=	/dev/tty00 \
 
 _INCOMPAT_ICONV=   OSF1-*-*
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 # sysutils/fam is not usable on OSF1.
 FAM_DEFAULT?=		gamin
 
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 964a5151eb4..d429625f0fe 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.28 2008/03/04 06:45:34 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.29 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -95,6 +95,8 @@ DEFAULT_SERIAL_DEVICE?=	/dev/null
 SERIAL_DEVICES?=	/dev/null
 .endif
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index f643e855177..55b738351a5 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.36 2009/01/14 23:33:48 sketch Exp $
+# $NetBSD: SunOS.mk,v 1.37 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -84,6 +84,8 @@ _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 05f50248caa..29adb45a667 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.27 2008/03/04 06:45:34 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.28 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -76,6 +76,8 @@ _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U}	# install(1) option to strip
 
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 
+_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.