summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2013-05-16 17:09:07 +0000
committerjperkin <jperkin@pkgsrc.org>2013-05-16 17:09:07 +0000
commitd02a4b6ead952f232feafbc8060efbff38c5b3e0 (patch)
treef2ea132094886e4fa55367deb1aa294f64df3d94 /mk
parentfee6e5f0e2989e11080e0ede6e75cdf939154852 (diff)
downloadpkgsrc-d02a4b6ead952f232feafbc8060efbff38c5b3e0.tar.gz
_OPSYS_SYSTEM_RPATH must match _OPSYS_LIB_DIRS or else the buildlink
substitutions will not be correct. Fixes issue with ABI=64 where /usr/lib/amd64 was being exposed, but packages will need to be rebuilt for the change to take effect.
Diffstat (limited to 'mk')
-rw-r--r--mk/platform/SunOS.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 614ade5f341..6caa3ca2c34 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.50 2013/04/28 12:53:56 obache Exp $
+# $NetBSD: SunOS.mk,v 1.51 2013/05/16 17:09:07 jperkin Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -78,10 +78,8 @@ PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
.if ${MACHINE_ARCH} == "x86_64"
LIBABISUFFIX= /amd64
-_OPSYS_SYSTEM_RPATH?= /lib/64:/usr/lib/64
-.else
-_OPSYS_SYSTEM_RPATH?= /lib:/usr/lib
.endif
+_OPSYS_SYSTEM_RPATH?= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
_OPSYS_INCLUDE_DIRS?= /usr/include