From ca7093842870728d22dde1258798b1704c53ca18 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 27 Aug 2004 06:29:06 +0000
Subject: Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
 which are the full option names used to set rpath directives for the linker
 and the compiler, respectively.  In places were we are invoking the linker,
 use "${LINKER_RPATH_FLAG} <path>", where the space is inserted in case the
 flag is a word, e.g. -rpath.  The default values of *_RPATH_FLAG are set by
 the compiler/*.mk files, depending on the compiler that you use.  They may be
 overridden on a ${OPSYS}-specific basis by setting _OPSYS_LINKER_RPATH_FLAG
 and _OPSYS_COMPILER_RPATH_FLAG, respectively.  Garbage-collect
 _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.

---
 lang/gcc3/distinfo         | 4 ++--
 lang/gcc3/patches/patch-ab | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lang/gcc3')

diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo
index e9590301f98..292939a3670 100644
--- a/lang/gcc3/distinfo
+++ b/lang/gcc3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2004/07/02 15:40:01 drochner Exp $
+$NetBSD: distinfo,v 1.20 2004/08/27 06:29:08 jlam Exp $
 
 SHA1 (gcc-3.3.4.tar.bz2) = f1690df8d2f0c60ada0c8d0c9c350063aa00f705
 Size (gcc-3.3.4.tar.bz2) = 23331664 bytes
 SHA1 (patch-aa) = 2b8d1fcbe1f8028a6a011e85bb3ef9c1a9373b36
-SHA1 (patch-ab) = f0795e3792cd5200140bc19e291a2616b7d31468
+SHA1 (patch-ab) = 304d640028f56cc17e9c79faf3f3a67ee50335d0
 SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
 SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
 SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
diff --git a/lang/gcc3/patches/patch-ab b/lang/gcc3/patches/patch-ab
index e6b7c3f8deb..2e5792f6503 100644
--- a/lang/gcc3/patches/patch-ab
+++ b/lang/gcc3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2004/04/10 15:47:08 seb Exp $
+$NetBSD: patch-ab,v 1.6 2004/08/27 06:29:08 jlam Exp $
 
 --- gcc/Makefile.in.orig	Tue Jan 28 16:54:07 2003
 +++ gcc/Makefile.in	Sat May 24 13:01:38 2003
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.5 2004/04/10 15:47:08 seb Exp $
  # Language-independent files.
  
  DRIVER_DEFINES = \
-+  -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(prefix)/lib\"" \
++  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)/lib\"" \
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
    -DDEFAULT_TARGET_VERSION=\"$(version)\" \
-- 
cgit v1.2.3