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

4 files changed, 9 insertions, 8 deletions

diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 0a9307cc014..091fd3f38b6 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/23 09:54:03 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/10 06:25:35 jmc Exp $
 
 DISTNAME=		sather-1.2.1
 CATEGORIES=		lang
@@ -13,6 +13,7 @@ USE_X11=		# defined
 USE_GMAKE=		# defined
 
 ALL_TARGET=		full optional
+MAKE_ENV+=		_OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME}
 
 INFO_FILES=		sather.info sather-tutorial.info sather-mode.info
 
diff --git a/lang/sather/distinfo b/lang/sather/distinfo
index 529b450bb6f..b8612a24c60 100644
--- a/lang/sather/distinfo
+++ b/lang/sather/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/04 00:45:34 jtb Exp $
+$NetBSD: distinfo,v 1.2 2003/03/10 06:25:35 jmc Exp $
 
 SHA1 (sather-1.2.1.tar.gz) = 434f6b9c69d63a022c83f3693011415ad9730cb1
 Size (sather-1.2.1.tar.gz) = 4458088 bytes
@@ -7,8 +7,8 @@ SHA1 (patch-ab) = e45f8a8230d1fbe3fc72babbecfa8148699f7906
 SHA1 (patch-ac) = 586cdebde7a2c1b49f9b75a33d26980a2c0397f3
 SHA1 (patch-ad) = 3d4f6030eb0928d4569a57d72087d34291da836a
 SHA1 (patch-ae) = c1aed9437daf2a03303f06850700f40a91da4a17
-SHA1 (patch-af) = 9c29c28aeacd56806e93765532915c57f09d5039
-SHA1 (patch-ag) = c76bc5687a2ba7ebc77ea76e124060fdd7eafdf6
+SHA1 (patch-af) = 752b27b4b6edd7cf3b3267434e8e6ff3e002e040
+SHA1 (patch-ag) = 00a9a8ed0085998c8ee89a188ace4915a00065d1
 SHA1 (patch-ah) = 9dad48a3bc7e6af65eb51ae6070b8e67cab9ca2b
 SHA1 (patch-ai) = a69d416dfff2d1efbfcb4b23b2730cdc644dda57
 SHA1 (patch-aj) = f9f4d36335fe4c20fa01f4ff6cba59edeb0deab7
diff --git a/lang/sather/patches/patch-af b/lang/sather/patches/patch-af
index 6e372442246..4152bc02069 100644
--- a/lang/sather/patches/patch-af
+++ b/lang/sather/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/04 00:45:35 jtb Exp $
+$NetBSD: patch-af,v 1.2 2003/03/10 06:25:36 jmc Exp $
 
 --- Boot/sacomp.code/Makefile.orig	Thu Nov  4 08:04:49 1999
 +++ Boot/sacomp.code/Makefile
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/04 00:45:35 jtb Exp $
 +CC     = @CC@
  HDR    =sather.h tags.h
 -LIBS   = -lgc -lm
-+LIBS   = -L@GC_PREFIX@/lib -lgc -lm
++LIBS   = -L@GC_PREFIX@/lib -Wl,${_OPSYS_RPATH_NAME}@GC_PREFIX@/lib -lgc -lm
  CS     =sacomp
  OBJ    = a_stackA_STACK2014955575.o am_outAM_OUT1363671444.o am_outAM_OUT1363671444x.o arefFSETAM_ROU1518004496.o arefFSETIMMUTA2116029667.o arefFSETTUPSIG268064465.o arrayARRAYAM_I1084914261.o arrayARRAYTUPI1927875024.o as_outAS_OUT1429002792.o as_outAS_OUT1429002792x.o cgenCGEN1354269066.o cgenCGEN1354269066x.o cgenCGEN1354269066xx.o cgenCGEN1354269066xxx.o cgenCGEN1354269066xxxx.o cgenCGEN1354269066xxxxx.o cgenCGEN1354269066xxxxxx.o cgenCGEN1354269066xxxxxxx.o cgenCGEN1354269066xxxxxxxx.o cgenCGEN1354269066xxxxxxxxx.o cgenCGEN1354269066xxxxxxxxxx.o code_fileCODE_372141741.o configCONFIG_R422014871.o cs_optionsCS_O301318552.o cs_optionsCS_O301318552x.o cursorAM_CURSO1314676474.o cursorAM_CURSO1314676474x.o cursorAM_CURSO1314676474xx.o cursorAM_CURSO1314676474xxx.o dispatch.o eltELT742463773.o elt_algELT_ALG1548486913.o elt_algELT_ALG241706736.o elt_algELT_ALG433952755.o elt_algELT_ALG656599769.o elt_algELT_ALG987448979.o flistFLISTAM_C1171004157.o flistFLISTTUPA253333040.o fmapFMAPAM_ROU1000508936.o fmapFMAPSTRFSE258056667.o fmapFMAPdTPCOD1051074108.o generate_amGEN60284023.o get_optionsCOD183550016.o globals.o get_optionsCOD183550016x.o implIMPL_CREAT99472218.o inlineINLINE_I1557365391.o intiINTI1462257232.o layoutCLASS_LA1330944056.o mangleMANGLE1705139666.o mangleNAMESPAC760510184.o o_localOPT_LOC907909712.o o_localOPT_LOC907909712x.o optimizeOPT_CO1177876774.o optimizeOPT_IT1193060919.o parsePARSER311504339.o parsePARSER311504339x.o parsePARSER311504339xx.o parsePARSER311504339xxx.o parsePARSER311504339xxxx.o progPROG_AS_TB824135997.o scanSCANNER1990933774.o side_effectSE_411721069.o strings.o stringsx.o stringsxx.o system.o stmtAM_FORK_ST1674905658.o tpTP_BUILTIN1142074570.o tpTP_ITER145455607.o transTRANS2123847391.o transTRANS2123847391x.o transTRANS2123847391xx.o transTRANS2123847391xxx.o transTRANS2123847391xxxx.o tupTUPAM_CURSO1313579705.o unbox.o unixUNIX1766692.o runtime.o
  OTHER  =
diff --git a/lang/sather/patches/patch-ag b/lang/sather/patches/patch-ag
index afe9f97756c..fee2c4f723c 100644
--- a/lang/sather/patches/patch-ag
+++ b/lang/sather/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/04 00:45:35 jtb Exp $
+$NetBSD: patch-ag,v 1.2 2003/03/10 06:25:36 jmc Exp $
 
 --- System/Common/CONFIG.proto.orig	Wed Nov  3 18:48:17 1999
 +++ System/Common/CONFIG.proto
@@ -13,7 +13,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2002/05/04 00:45:35 jtb Exp $
 +VERSION:		"1.2.1";
 +C_COMPILER:		"@CC@";
 +CC_OPTIONS:		"-I@GC_PREFIX@/include";
-+GC_LINK:		"-L@GC_PREFIX@/lib -lgc";
++GC_LINK:		"-L@GC_PREFIX@/lib -Wl,${_OPSYS_RPATH_NAME}@GC_PREFIX@/lib -lgc";
  LINK_OPTIONS:		"-lm";
 -MAKE_COMMAND:		"make";
 +MAKE_COMMAND:		"@GMAKE@";