summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-09-23 08:29:56 +0000
committerjlam <jlam@pkgsrc.org>2002-09-23 08:29:56 +0000
commit04cb5535df26d69e3a97892c698caaf03829b99f (patch)
tree5c9a74d1e3088bf4e7a7b2cc4cefa420b421d5c4 /x11
parent74c6e1f3e284bd31b0d3224adee09f5d6f87a5fd (diff)
downloadpkgsrc-04cb5535df26d69e3a97892c698caaf03829b99f.tar.gz
Add the -Wl,-R flags to find the widget library. The ld wrapper script
understands "-Wl,-R" to be just "-R", so it will work fine.
Diffstat (limited to 'x11')
-rw-r--r--x11/Xaw-Xpm/buildlink2.mk7
-rw-r--r--x11/Xaw3d/buildlink2.mk6
-rw-r--r--x11/neXtaw/buildlink2.mk7
3 files changed, 13 insertions, 7 deletions
diff --git a/x11/Xaw-Xpm/buildlink2.mk b/x11/Xaw-Xpm/buildlink2.mk
index 8aaaac7e5c9..7c28b6e8038 100644
--- a/x11/Xaw-Xpm/buildlink2.mk
+++ b/x11/Xaw-Xpm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:26 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 08:29:58 jlam Exp $
.if !defined(XAWXPM_BUILDLINK2_MK)
XAWXPM_BUILDLINK2_MK= # defined
@@ -17,7 +17,10 @@ BUILDLINK_FILES.Xaw-Xpm+= lib/libXaw3d.*
BUILDLINK_TARGETS+= Xaw-Xpm-buildlink
LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \
- -L${BUILDLINK_PREFIX.xpm}/lib -lXaw3d -lXpm
+ -Wl,-R${BUILDLINK_PREFIX.Xaw-Xpm}/lib \
+ -L${BUILDLINK_PREFIX.xpm}/lib \
+ -Wl,-R${BUILDLINK_PREFIX.xpm}/lib \
+ -lXaw3d -lXpm
Xaw-Xpm-buildlink: _BUILDLINK_USE
diff --git a/x11/Xaw3d/buildlink2.mk b/x11/Xaw3d/buildlink2.mk
index 94d4e7178c6..41205f498c1 100644
--- a/x11/Xaw3d/buildlink2.mk
+++ b/x11/Xaw3d/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:26 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 08:29:59 jlam Exp $
.if !defined(XAW3D_BUILDLINK2_MK)
XAW3D_BUILDLINK2_MK= # defined
@@ -15,7 +15,9 @@ BUILDLINK_FILES.Xaw3d+= lib/libXaw3d.*
BUILDLINK_TARGETS+= Xaw3d-buildlink
-LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib -lXaw3d
+LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \
+ -Wl,-R${BUILDLINK_PREFIX.Xaw3d}/lib \
+ -lXaw3d
Xaw3d-buildlink: _BUILDLINK_USE
diff --git a/x11/neXtaw/buildlink2.mk b/x11/neXtaw/buildlink2.mk
index 72721b1f5ce..e4eb2a0fd71 100644
--- a/x11/neXtaw/buildlink2.mk
+++ b/x11/neXtaw/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/08/28 15:11:21 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2002/09/23 08:29:59 jlam Exp $
.if !defined(NEXTAW_BUILDLINK2_MK)
NEXTAW_BUILDLINK2_MK= # defined
@@ -14,8 +14,9 @@ BUILDLINK_FILES.neXtaw+= lib/libneXtaw.*
BUILDLINK_TARGETS+= neXtaw-buildlink
-LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib -lneXtaw
-MAKE_ENV+= LIBXAW="${LIBXAW}"
+LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \
+ -Wl,-R${BUILDLINK_PREFIX.neXtaw}/lib \
+ -lneXtaw
neXtaw-buildlink: _BUILDLINK_USE