From c534f2167664e9746737a15a375724fdf1455d5e Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 22 May 2006 22:22:02 +0000 Subject: Move the check-shlibs target from bsd.pkg.mk to bsd.pkg.check.mk where it will live with other "check" targets run after package installation. Get rid of SHLIB_HANDLING, whose meaning had mutated over the years from one thing to another. Currently, it is used to basically note whether the system's "ldd" command can be usefully run on the package's binaries and libraries. Rename this variable to CHECK_SHLIBS_SUPPORTED for more clarity. CHECK_SHLIBS is now a variable set exclusively by the user in /etc/mk.conf to note whether the check for missing run-time search paths is performed after a package is installed. It defaults to "no" unless PKG_DEVELOPER is set. --- emulators/compat12/Makefile | 4 ++-- emulators/compat13/Makefile | 4 ++-- emulators/compat14-crypto/Makefile | 4 ++-- emulators/compat14/Makefile | 4 ++-- emulators/compat16/Makefile | 4 ++-- emulators/linuxppc_lib/Makefile | 5 ++--- emulators/m1/Makefile | 3 +-- emulators/netbsd32_compat14/Makefile | 4 ++-- emulators/netbsd32_compat15/Makefile | 4 ++-- emulators/netbsd32_compat16/Makefile | 4 ++-- emulators/osf1_lib/Makefile | 5 ++--- emulators/ski/Makefile | 3 +-- emulators/suse_linux/Makefile.application | 8 +++++++- emulators/vmware/Makefile | 3 +-- emulators/vmware3/Makefile | 3 +-- emulators/xyame/Makefile | 4 +--- 16 files changed, 32 insertions(+), 34 deletions(-) (limited to 'emulators') diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile index a34da03361a..b7cf006fd05 100644 --- a/emulators/compat12/Makefile +++ b/emulators/compat12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/03/14 01:14:27 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= compat12-${MACHINE_ARCH} @@ -15,7 +15,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-ns32k \ NO_BUILD= yes NO_MTREE= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile index 77b43164d67..f4c2b523efd 100644 --- a/emulators/compat13/Makefile +++ b/emulators/compat13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:27 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= compat13-${MACHINE_ARCH}${PKGMINOR} @@ -18,7 +18,7 @@ NOT_FOR_PLATFORM= NetBSD-1.3*-* NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile index 3d86b1cf952..6022c78bbc9 100644 --- a/emulators/compat14-crypto/Makefile +++ b/emulators/compat14-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= compat14-crypto-${MACHINE_ARCH}-${VERSION} @@ -22,7 +22,7 @@ CRYPTO= YES NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile index 2fc10b63203..310180524b1 100644 --- a/emulators/compat14/Makefile +++ b/emulators/compat14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= compat14-${MACHINE_ARCH}-${VERSION} @@ -20,7 +20,7 @@ NOT_FOR_PLATFORM= NetBSD-1.3*-* NetBSD-1.4*-* NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} diff --git a/emulators/compat16/Makefile b/emulators/compat16/Makefile index 798ef4185a4..08193f88ef7 100644 --- a/emulators/compat16/Makefile +++ b/emulators/compat16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:34 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= compat16-${MACHINE_ARCH}-${VERSION} @@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.6[A-Z]*-i386 NetBSD-[2-9]*-i386 NO_MTREE= yes NO_BUILD= yes NO_CONFIGURE= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no EMULSUBDIR= emul/netbsd16 diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile index b1877327807..84d8845bcd5 100644 --- a/emulators/linuxppc_lib/Makefile +++ b/emulators/linuxppc_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/02/05 23:09:01 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2006/05/22 22:22:03 jlam Exp $ DISTNAME= linuxppc_lib-2000.4.6 PKGREVISION= 1 @@ -27,8 +27,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.5[U-Z]-powerpc NetBSD-1.5Z[A-Z]-powerpc \ NetBSD-1.6*-powerpc NetBSD-[2-9]*-powerpc WRKSRC= ${WRKDIR}/${DISTNAME} -SHLIB_HANDLING= NO -CHECK_SHLIBS= NO +CHECK_SHLIBS_SUPPORTED= no DIST_SUBDIR= linuxppc_lib PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC diff --git a/emulators/m1/Makefile b/emulators/m1/Makefile index cffc15f1799..b665d5bd609 100644 --- a/emulators/m1/Makefile +++ b/emulators/m1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:02 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= m1074b2-lnx @@ -22,7 +22,6 @@ ONLY_FOR_PLATFORM= *-*-i386 WRKSRC= ${WRKDIR}/m1-0.7.4 NO_BUILD= yes -CHECK_SHLIBS= no INSTALLATION_DIRS= bin diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile index 943ff88ff7c..b75ad964c88 100644 --- a/emulators/netbsd32_compat14/Makefile +++ b/emulators/netbsd32_compat14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= compat14-${MACHINE32_ARCH}-${VERSION} @@ -28,7 +28,7 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-x86_64 NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile index ef41429b455..c932bd5b17c 100644 --- a/emulators/netbsd32_compat15/Makefile +++ b/emulators/netbsd32_compat15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/22 22:22:03 jlam Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -22,7 +22,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-sparc64 NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q} FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile index 71387c927f8..8caad2b3c16 100644 --- a/emulators/netbsd32_compat16/Makefile +++ b/emulators/netbsd32_compat16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/22 22:22:03 jlam Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -31,7 +31,7 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-x86_64 NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile index 454874ba25a..79a9c7c6c67 100644 --- a/emulators/osf1_lib/Makefile +++ b/emulators/osf1_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/04/22 09:22:08 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2006/05/22 22:22:03 jlam Exp $ DISTNAME= netscape-4.7-3.alpha PKGNAME= osf1_lib-1.1 @@ -34,8 +34,7 @@ DEINSTALL_SRC= # empty RPMARGS= -i usr/lib -i usr/bin ${DISTDIR}/${DISTFILES} -CHECK_SHLIBS= no -SHLIB_HANDLING= no +CHECK_SHLIBS_SUPPORTED= no .include "../../mk/x11.buildlink3.mk" diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile index 013b80fb609..f81390ac8ed 100644 --- a/emulators/ski/Makefile +++ b/emulators/ski/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/03/10 23:45:14 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2006/05/22 22:22:03 jlam Exp $ DISTNAME= ski-0.9.81-l6-i686 PKGNAME= ski-0.9.81.6 @@ -25,7 +25,6 @@ DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11 WRKSRC= ${WRKDIR} INTERACTIVE_STAGE= fetch extract -CHECK_SHLIBS= NO NO_BUILD= YES DOWNLOAD= http://www.hpl.hp.com/research/linux/ski/download.php diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application index 83dc9a93be4..7eae8b8cab0 100644 --- a/emulators/suse_linux/Makefile.application +++ b/emulators/suse_linux/Makefile.application @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.application,v 1.18 2006/03/09 20:42:38 tonio Exp $ +# $NetBSD: Makefile.application,v 1.19 2006/05/22 22:22:03 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -28,4 +28,10 @@ USE_NATIVE_LINUX= # empty SUSE_DIR_PREFIX= suse SUSE_VERSION= 0 PKG_SKIP_REASON+= "${PKGNAME} requires compat_linux, which is not available for ${MACHINE_PLATFORM}" +# +# By default, we can't check for missing shared libraries nor note which +# shared libraries are provided and/or required by the package since the +# library support is via syscall emulation. +# +CHECK_SHLIBS_SUPPORTED?= no .endif diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile index 6540cfdce0d..c7964c3e182 100644 --- a/emulators/vmware/Makefile +++ b/emulators/vmware/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:37 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/05/22 22:22:03 jlam Exp $ DISTNAME= VMware-2.0.4-1142 PKGNAME= vmware-2.0.4 @@ -25,7 +25,6 @@ DEPENDS+= suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware LICENSE= vmware-license WRKSRC= ${WRKDIR}/vmware-distrib -CHECK_SHLIBS= NO ONLY_FOR_PLATFORM= NetBSD-*-i386 diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 1cd4e813429..b5d674a6ce3 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/26 21:37:12 veego Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/22 22:22:03 jlam Exp $ DISTNAME= VMware-workstation-3.2.1-2242 PKGNAME= vmware-3.2.1pl1 @@ -30,7 +30,6 @@ DEPENDS+= suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware LICENSE= vmware-license WRKSRC= ${WRKDIR}/vmware-distrib -CHECK_SHLIBS= NO ONLY_FOR_PLATFORM= NetBSD-*-i386 # There is a kernel bug in NetBSD 3.0 for vmware. diff --git a/emulators/xyame/Makefile b/emulators/xyame/Makefile index 38fc5494e8d..02d972cb14e 100644 --- a/emulators/xyame/Makefile +++ b/emulators/xyame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:05 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= xyame038 @@ -21,8 +21,6 @@ WRKSRC= ${WRKDIR} NO_CONFIGURE= yes NO_BUILD= yes -CHECK_SHLIBS= no - ONLY_FOR_PLATFORM+= *-*-i386 INSTALLATION_DIRS= bin man/man6 -- cgit v1.2.3