[pkgsrc/trunk]: pkgsrc/mk Make the default rpath for USE_CHECK_SHLIBS_ELF a p...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/07d13389efe1
branches:  trunk
changeset: 537811:07d13389efe1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jan 16 14:03:31 2008 +0000

description:
Make the default rpath for USE_CHECK_SHLIBS_ELF a platform variable.
Define the values for NetBSD and DragonFly.

diffstat:

 mk/check/check-shlibs.mk |  4 ++--
 mk/platform/DragonFly.mk |  4 +++-
 mk/platform/NetBSD.mk    |  4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r 639d9700b4af -r 07d13389efe1 mk/check/check-shlibs.mk
--- a/mk/check/check-shlibs.mk  Wed Jan 16 13:54:39 2008 +0000
+++ b/mk/check/check-shlibs.mk  Wed Jan 16 14:03:31 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs.mk,v 1.12 2007/08/20 11:04:03 joerg Exp $
+# $NetBSD: check-shlibs.mk,v 1.13 2008/01/16 14:03:31 joerg Exp $
 #
 # This file verifies that all libraries used by the package can be found
 # at run-time.
@@ -40,7 +40,7 @@
 
 .if !empty(USE_CHECK_SHLIBS_ELF:M[yY][eE][sS])
 CHECK_SHLIBS_ELF=      ${PKGSRCDIR}/mk/check/check-shlibs-elf.awk
-CHECK_SHLIBS_ELF_ENV=  PLATFORM_RPATH=/usr/lib
+CHECK_SHLIBS_ELF_ENV=  PLATFORM_RPATH=${_OPSYS_SYSTEM_RPATH:Q}
 CHECK_SHLIBS_ELF_ENV+= READELF=${TOOLS_PATH.readelf:Q}
 CHECK_SHLIBS_ELF_ENV+= CROSS_DESTDIR=${_CROSS_DESTDIR:Q}
 CHECK_SHLIBS_ELF_ENV+= PKG_INFO_CMD=${PKG_INFO:Q}
diff -r 639d9700b4af -r 07d13389efe1 mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk  Wed Jan 16 13:54:39 2008 +0000
+++ b/mk/platform/DragonFly.mk  Wed Jan 16 14:03:31 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.34 2007/10/19 13:41:35 rillig Exp $
+# $NetBSD: DragonFly.mk,v 1.35 2008/01/16 14:03:31 joerg Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -46,6 +46,8 @@
 
 _OPSYS_EMULDIR.linux=  /compat/linux
 
+_OPSYS_SYSTEM_RPATH?=          /usr/lib:/usr/lib/gcc41:/usr/lib/gcc34
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=      yes     # IPv6 is standard
 .else
diff -r 639d9700b4af -r 07d13389efe1 mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Wed Jan 16 13:54:39 2008 +0000
+++ b/mk/platform/NetBSD.mk     Wed Jan 16 14:03:31 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.27 2007/10/19 13:41:35 rillig Exp $
+# $NetBSD: NetBSD.mk,v 1.28 2008/01/16 14:03:31 joerg Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -75,6 +75,8 @@
 _OPSYS_EMULDIR.solaris32=      /emul/svr4_32
 _OPSYS_EMULDIR.sunos=          /emul/sunos
 
+_OPSYS_SYSTEM_RPATH?=          /usr/lib
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=      yes     # IPv6 is standard
 .else