diff options
| author | joerg <joerg@pkgsrc.org> | 2008-01-16 14:03:31 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-01-16 14:03:31 +0000 |
| commit | daa4ab947066635c89693b716b8ad3554786b155 (patch) | |
| tree | 7522c7ad601876bd04e00cb002fbdd1f38108aa1 | |
| parent | a98d6a0834b0baeb65720b085b74b5a7b9e3fa18 (diff) | |
| download | pkgsrc-daa4ab947066635c89693b716b8ad3554786b155.tar.gz | |
Make the default rpath for USE_CHECK_SHLIBS_ELF a platform variable.
Define the values for NetBSD and DragonFly.
| -rw-r--r-- | mk/check/check-shlibs.mk | 4 | ||||
| -rw-r--r-- | mk/platform/DragonFly.mk | 4 | ||||
| -rw-r--r-- | mk/platform/NetBSD.mk | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/mk/check/check-shlibs.mk b/mk/check/check-shlibs.mk index ef093b8002b..6264bc336cd 100644 --- a/mk/check/check-shlibs.mk +++ b/mk/check/check-shlibs.mk @@ -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 @@ privileged-install-hook: _check-shlibs .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 --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk index a02c278d4d8..076e01ef74a 100644 --- a/mk/platform/DragonFly.mk +++ b/mk/platform/DragonFly.mk @@ -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 @@ IMAKE_MANINSTALL?= maninstall catinstall _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 --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk index 33539d343e3..cb41236fbf0 100644 --- a/mk/platform/NetBSD.mk +++ b/mk/platform/NetBSD.mk @@ -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.solaris= /emul/svr4 _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 |