diff options
author | agc <agc> | 2001-11-21 13:17:14 +0000 |
---|---|---|
committer | agc <agc> | 2001-11-21 13:17:14 +0000 |
commit | fd607743bc25a6bb7c6c12a03c6c5889e7ee2b1d (patch) | |
tree | 703b35a3650e6f43d316098c5b007f4016f0cb15 | |
parent | cfba30ccda5bfcfebd6bfdd2b59ae93c26a5a9fd (diff) | |
download | pkgsrc-fd607743bc25a6bb7c6c12a03c6c5889e7ee2b1d.tar.gz |
Add a _DO_SHLIB_CHECKS definition to the individual defs.${OPSYS}.mk
files, and use it in bsd.pkg.mk. This definition controls the fixup
of PLISTs at installation time, and running of ldconfig if necessary.
-rw-r--r-- | mk/bsd.pkg.mk | 6 | ||||
-rw-r--r-- | mk/defs.Darwin.mk | 3 | ||||
-rw-r--r-- | mk/defs.Linux.mk | 3 | ||||
-rw-r--r-- | mk/defs.NetBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.SunOS.mk | 3 |
5 files changed, 11 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 5c0ccf3c219..05f7f0c1bf0 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.856 2001/11/21 13:09:08 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.857 2001/11/21 13:17:14 agc Exp $ # # This file is in the public domain. # @@ -1770,10 +1770,10 @@ real-su-install: ${MESSAGE} fi; \ done; \ fi -.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" +.if ${_DO_SHLIB_CHECKS} == "yes" ${_PKG_SILENT}${_PKG_DEBUG}\ ${MAKE} ${MAKEFLAGS} do-shlib-handling SHLIB_PLIST_MODE=0 -.endif # OPSYS == "NetBSD" || OPSYS == "SunOS" +.endif .ifdef MESSAGE @${ECHO_MSG} "${_PKGSRC_IN}> Please note the following:" @${ECHO_MSG} "" diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 5ed5fe152eb..676f0abdaa8 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.9 2001/11/21 13:09:09 agc Exp $ +# $NetBSD: defs.Darwin.mk,v 1.10 2001/11/21 13:17:14 agc Exp $ # # Variable definitions for the Darwin operating system. @@ -60,6 +60,7 @@ ROOT_USER?= root ROOT_GROUP?= wheel _DO_LIBINTL_CHECKS= yes # perform checks for valid libintl +_DO_SHLIB_CHECKS= no # on installation, fixup PLIST for shared libs _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake _PATCH_BACKUP_ARG= -z # switch to patch(1) for backup file _USE_RPATH= no # don't add rpath to LDFLAGS diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index 4df4cddd843..61d915f7315 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.15 2001/11/21 13:09:09 agc Exp $ +# $NetBSD: defs.Linux.mk,v 1.16 2001/11/21 13:17:14 agc Exp $ # # Variable definitions for the Linux operating system. @@ -64,6 +64,7 @@ ROOT_USER?= root ROOT_GROUP?= wheel _DO_LIBINTL_CHECKS= no # perform checks for valid libintl +_DO_SHLIB_CHECKS= no # on installation, fixup PLIST for shared libs _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake _PATCH_BACKUP_ARG= -z # switch to patch(1) for backup file _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index d99d731d497..7eef980a3e7 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.13 2001/11/21 13:09:09 agc Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.14 2001/11/21 13:17:14 agc Exp $ # # Variable definitions for the NetBSD operating system. @@ -69,6 +69,7 @@ ROOT_USER?= root ROOT_GROUP?= wheel _DO_LIBINTL_CHECKS= yes # perform checks for valid libintl +_DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake _PATCH_BACKUP_ARG= -b # switch to patch(1) to provide a backup file _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index a64fc755fc3..df15e875945 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.12 2001/11/21 13:09:09 agc Exp $ +# $NetBSD: defs.SunOS.mk,v 1.13 2001/11/21 13:17:14 agc Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -71,6 +71,7 @@ ROOT_USER?= root ROOT_GROUP?= root _DO_LIBINTL_CHECKS= yes # perform checks for valid libintl +_DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs _IMAKE_MAKE= /usr/ccs/bin/make # program which gets invoked by imake _PATCH_BACKUP_ARG= -z # switch to patch(1) for backup file _USE_RPATH= yes # add rpath to LDFLAGS |