From 6e9f4cbb2b2c6faff1a4e243b5884f88a55d4a3c Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sun, 20 Jun 2010 22:20:18 +0000
Subject: Fix build problem under Mac OS X Snow Leopard by avoiding to link two
 object files twice (once directly and once via static libraries).

---
 cross/avr-gcc/distinfo         |  3 ++-
 cross/avr-gcc/patches/patch-ac | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 cross/avr-gcc/patches/patch-ac

(limited to 'cross')

diff --git a/cross/avr-gcc/distinfo b/cross/avr-gcc/distinfo
index e2e689ba7c6..4eabb36522b 100644
--- a/cross/avr-gcc/distinfo
+++ b/cross/avr-gcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2009/08/27 15:29:37 hasso Exp $
+$NetBSD: distinfo,v 1.5 2010/06/20 22:20:18 tron Exp $
 
 SHA1 (gcc-core-4.4.1.tar.bz2) = 7e18b5f49b77a78e0ccd31c82c6220c5756da754
 RMD160 (gcc-core-4.4.1.tar.bz2) = 6545aea8ad1c9ae55cb0f12991456a0dd3bc490d
@@ -8,3 +8,4 @@ RMD160 (gcc-g++-4.4.1.tar.bz2) = 67b2774d14eea8272b214f0d879e70fb6920b3bf
 Size (gcc-g++-4.4.1.tar.bz2) = 5936040 bytes
 SHA1 (patch-aa) = 17ee1942842186c4336d72bb8223bdb3023c85c1
 SHA1 (patch-ab) = 4a3ab9719a6714933954a120ad8c594c3a4a2e1f
+SHA1 (patch-ac) = 14dbe72be88bd6fb0fd8671494454a6d4c11c4b7
diff --git a/cross/avr-gcc/patches/patch-ac b/cross/avr-gcc/patches/patch-ac
new file mode 100644
index 00000000000..ea519ab98aa
--- /dev/null
+++ b/cross/avr-gcc/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.3 2010/06/20 22:20:18 tron Exp $
+
+Avoid linking "tree-inline.o" twice which breaks the build under Mac OS X.
+
+--- gcc/cp/Make-lang.in.orig	2008-12-05 08:01:58.000000000 +0000
++++ gcc/cp/Make-lang.in	2010-06-20 23:11:07.000000000 +0100
+@@ -72,8 +72,8 @@
+ # Shared with C front end:
+ CXX_C_OBJS = attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o \
+ 	c-dump.o $(CXX_TARGET_OBJS) c-pretty-print.o c-opts.o c-pch.o \
+-	incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \
+-	c-gimplify.o c-omp.o tree-inline.o
++	incpath.o c-ppoutput.o c-cppbuiltin.o prefix.o \
++	c-gimplify.o c-omp.o
+ 
+ # Language-specific object files for C++ and Objective C++.
+ CXX_AND_OBJCXX_OBJS = cp/call.o cp/decl.o cp/expr.o cp/pt.o cp/typeck2.o \
-- 
cgit v1.2.3