Needs -Wl,-R (or the equiv) when linking libgc. Pass _OPSYS_RPATH_NAME in and

use that accordingly

4 files changed, 11 insertions, 10 deletions

diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 9ae572d4584..52bca5d2012 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/18 07:58:35 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/10 04:09:04 jmc Exp $
 
 DISTNAME=		mercury-compiler-0.10.1
 PKGNAME=		mercury-0.10.1
@@ -23,6 +23,7 @@ CONFIGURE_ENV+=		BOEHM_GC_DIR=${BOEHM_GC_DIR}
 
 # Some of the scripts test CC and use special settings for gcc.
 CONFIGURE_ENV+=		CC=gcc
+MAKE_ENV+=		_OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/mercury/lib/${MACHINE_GNU_PLATFORM}
diff --git a/lang/mercury/distinfo b/lang/mercury/distinfo
index 5f4f8057c20..ed49ed6deae 100644
--- a/lang/mercury/distinfo
+++ b/lang/mercury/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/03/06 20:55:12 jmc Exp $
+$NetBSD: distinfo,v 1.3 2003/03/10 04:09:04 jmc Exp $
 
 SHA1 (mercury-compiler-0.10.1.tar.gz) = 5e4e660cca1e9e6e28026814fd2e6d014ab9d856
 Size (mercury-compiler-0.10.1.tar.gz) = 10428428 bytes
@@ -7,10 +7,10 @@ SHA1 (patch-ab) = 912d8d6db3af3c4119e05a4337353cd6a8e34992
 SHA1 (patch-ac) = 0aa3cbc9c8103337c6c95ec824a3c45b5696b580
 SHA1 (patch-ad) = cd16a2bef5b0629ec013d9a6c5988449168a8a27
 SHA1 (patch-ae) = 91bfb5a978958f14381dbdd93d282009c618dbfc
-SHA1 (patch-af) = 3d8ec830e28b66c0533f99eaf6edb80ef6391c52
+SHA1 (patch-af) = e070ccc8afa535da9c24c78d17c3bd7e3dee90a2
 SHA1 (patch-ag) = f6d40c264b7046263f32b7321396648527a10e6f
 SHA1 (patch-ah) = 87b4976ca126f0b4e26636f770716cd34cebdf1d
-SHA1 (patch-ai) = 7ca545d17a3981f7d6e872c4b3cacaba3f782fd7
+SHA1 (patch-ai) = fa4a3c80767128183c0b3f2fd93aaebad797abc8
 SHA1 (patch-aj) = 42ae96a2834b3a045b35506de988c48c5330e13d
 SHA1 (patch-ak) = cd2344776a799f0dd3bbaab4195cbf41c0cf894a
 SHA1 (patch-al) = eebee2b980f989639e4f117d90e931e7f7cb128e
diff --git a/lang/mercury/patches/patch-af b/lang/mercury/patches/patch-af
index 0a8fbe785f5..b9573444a45 100644
--- a/lang/mercury/patches/patch-af
+++ b/lang/mercury/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/05/15 21:09:57 jtb Exp $
+$NetBSD: patch-af,v 1.2 2003/03/10 04:09:04 jmc Exp $
 
 --- compiler/Mmakefile.orig	Mon Feb 19 14:50:26 2001
-+++ compiler/Mmakefile
++++ compiler/Mmakefile	Mon Mar 10 03:04:14 2003
 @@ -40,7 +40,6 @@
  			-I$(TRACE_DIR) \
  			-I$(LIBRARY_DIR) \
@@ -15,7 +15,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/15 21:09:57 jtb Exp $
  			*.par*.gc*)	echo $(BOEHM_GC_DIR)/libpar_gc.$A ;; \
  			*.gc*.prof*)	echo $(BOEHM_GC_DIR)/libgc_prof.$A ;; \
 -			*.gc*)		echo $(BOEHM_GC_DIR)/libgc.$A ;; \
-+			*.gc*)		echo -L$(BOEHM_GC_DIR)/lib -lgc ;; \
++			*.gc*)		echo -L$(BOEHM_GC_DIR)/lib -Wl,${_OPSYS_RPATH_NAME}$(BOEHM_GC_DIR)/lib -lgc ;; \
  		    esac \
  		` \
  		$(GCC_BACKEND_LIBS) \
diff --git a/lang/mercury/patches/patch-ai b/lang/mercury/patches/patch-ai
index 01b4c028817..1b9fdb5dd48 100644
--- a/lang/mercury/patches/patch-ai
+++ b/lang/mercury/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/05/15 21:09:57 jtb Exp $
+$NetBSD: patch-ai,v 1.2 2003/03/10 04:09:04 jmc Exp $
 
 --- profiler/Mmakefile.orig	Mon Feb 19 14:51:41 2001
-+++ profiler/Mmakefile
++++ profiler/Mmakefile	Mon Mar 10 03:03:43 2003
 @@ -24,7 +24,6 @@
  			-I$(TRACE_DIR) \
  			-I$(LIBRARY_DIR) \
@@ -15,7 +15,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2001/05/15 21:09:57 jtb Exp $
  			*.par*.gc*)	echo $(BOEHM_GC_DIR)/libpar_gc.$A ;; \
  			*.gc*.prof*)	echo $(BOEHM_GC_DIR)/libgc_prof.$A ;; \
 -			*.gc*)		echo $(BOEHM_GC_DIR)/libgc.$A ;; \
-+			*.gc*)		echo -L$(BOEHM_GC_DIR)/lib -lgc ;; \
++			*.gc*)		echo -L$(BOEHM_GC_DIR)/lib -Wl,${_OPSYS_RPATH_NAME}$(BOEHM_GC_DIR)/lib -lgc ;; \
  		    esac \
  		` $(MATH_LIB)
  MSL	=	MERCURY_SP_LIB_DIR=$(LIBRARY_DIR) $(SCRIPTS_DIR)/msl