Add patch-ac from lang/gcc44. Without it, programs built with this gcc

lack the rpath to libgcc, causing all kinds of trouble.

6 files changed, 32 insertions, 5 deletions

diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 110ddfbba2e..15aa04a3de6 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2011/07/11 22:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2011/10/18 17:55:27 hans Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc45-${GCC_VERSION}
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index ec272ad28fc..e11b9b3f064 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2011/07/11 22:31:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2011/10/18 17:55:27 hans Exp $
 
 SHA1 (gcc-4.5.3.tar.bz2) = 73c45dfda5eef6b124be53e56828b5925198cc1b
 RMD160 (gcc-4.5.3.tar.bz2) = d07aa90f2186b4e082dfd5ad5d5188c097fb6247
 Size (gcc-4.5.3.tar.bz2) = 66374586 bytes
 SHA1 (patch-aa) = c488dc25e038d97c737c8c72437660598d9e15d3
 SHA1 (patch-ab) = 61bc2ebf150c6e471917e145d74e7795dc162194
+SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
 SHA1 (patch-ad) = 55b5303b494dbef323bd59464c7c14863f81c6e3
 SHA1 (patch-af) = 54fb9fb3438eb7c646b9d51b6b0cf3ded27d4989
 SHA1 (patch-ag) = b58f8b82fcf17c60eb2700bc54d6625ca45e542b
diff --git a/lang/gcc45/patches/patch-ac b/lang/gcc45/patches/patch-ac
new file mode 100644
index 00000000000..827319faa30
--- /dev/null
+++ b/lang/gcc45/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2011/10/18 17:55:27 hans Exp $
+
+--- gcc/Makefile.in.orig	2004-06-17 15:56:58.000000000 -0600
++++ gcc/Makefile.in
+@@ -1944,6 +1944,7 @@ c-omp.o : c-omp.c $(CONFIG_H) $(SYSTEM_H
+ # Language-independent files.
+ 
+ DRIVER_DEFINES = \
++  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(exec_prefix)/lib\"" \
+   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
+   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
+   -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 0aa8866fc92..f45a9c14cba 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/10/13 14:30:48 hans Exp $
+# $NetBSD: Makefile,v 1.11 2011/10/18 17:56:15 hans Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc46-${GCC_VERSION}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index e055a3f527a..4edab2ef821 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2011/08/13 14:06:22 wiz Exp $
+$NetBSD: distinfo,v 1.3 2011/10/18 17:56:15 hans Exp $
 
 SHA1 (gcc-4.6.1.tar.bz2) = 8bf66f7a71534ba564563a0ba0b2517aead8ac30
 RMD160 (gcc-4.6.1.tar.bz2) = e12a50dc951b02c62916acfbb181c00cae176fd0
 Size (gcc-4.6.1.tar.bz2) = 71688404 bytes
 SHA1 (patch-aa) = 801b340bb24586c84b09f53161a7aced141ab9d9
 SHA1 (patch-ab) = f69d2db611aee1d31b7872bbf59d2b651413b3d3
+SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
 SHA1 (patch-ad) = 42894f37b20f85e601b941a8fea99d2af3f8b6c7
 SHA1 (patch-af) = fb06bce10adc88d3f6829f41a91f4612a72434fd
 SHA1 (patch-ag) = 4b82b06880bdccc3f967c8633e957fef4509dbc1
diff --git a/lang/gcc46/patches/patch-ac b/lang/gcc46/patches/patch-ac
new file mode 100644
index 00000000000..c41bd082f47
--- /dev/null
+++ b/lang/gcc46/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2011/10/18 17:56:16 hans Exp $
+
+--- gcc/Makefile.in.orig	2004-06-17 15:56:58.000000000 -0600
++++ gcc/Makefile.in
+@@ -1944,6 +1944,7 @@ c-omp.o : c-omp.c $(CONFIG_H) $(SYSTEM_H
+ # Language-independent files.
+ 
+ DRIVER_DEFINES = \
++  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(exec_prefix)/lib\"" \
+   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
+   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
+   -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \