From 8456d02b41635e0579f4da5a5bbd4d23c957eb5b Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Wed, 14 Jul 2010 08:36:43 +0000
Subject: [PATCH] Update to 4.3.5 for Solaris 2.6/sparc

---
 gcc43/build.sh    | 9 +++++++--
 gcc43/meta/pkgdef | 4 +---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gcc43/build.sh b/gcc43/build.sh
index de7b39e..30a55c1 100755
--- a/gcc43/build.sh
+++ b/gcc43/build.sh
@@ -7,8 +7,8 @@
 # Check the following 4 variables before running the script
 snapshot=
 topdir=gcc
-version=4.3.4
-pkgver=2
+version=4.3.5
+pkgver=1
 source[0]=ftp://ftp.sunet.se/pub/gnu/gcc/releases/$topdir-$version/$topdir-$version.tar.bz2
 #source[0]=gcc-4.3-$snapshot.tar.bz2
 ## If there are no patches, simply comment this
@@ -135,22 +135,27 @@ install()
 	compat $pkg 4.3.1 1 2
 	compat $pkg 4.3.2 1 2
 	compat $pkg 4.3.3 1 2
+	compat $pkg 4.3.4 1 2
     done
     compat libobjc2 4.2.3 1 2
     compat libobjc2 4.2.4 1 2
     compat libobjc2 4.3.1 1 2
     compat libobjc2 4.3.2 1 2
     compat libobjc2 4.3.3 1 2
+    compat libobjc2 4.3.4 1 2
     compat libgomp1 4.2.3 1 2
     compat libgomp1 4.2.4 1 2
     compat libgomp1 4.3.1 1 2
     compat libgomp1 4.3.2 1 2
     compat libgomp1 4.3.3 1 2
+    compat libgomp1 4.3.4 1 2
     compat libgfortran3 4.3.1 1 2
     compat libgfortran3 4.3.2 1 2
     compat libgfortran3 4.3.3 1 2
+    compat libgfortran3 4.3.4 1 2
     compat libgnat43 4.3.2 1 2
     compat libgnat43 4.3.3 1 2
+    compat libgnat43 4.3.4 1 2
     datestamp
 }
 
diff --git a/gcc43/meta/pkgdef b/gcc43/meta/pkgdef
index 2f479af..11a9105 100644
--- a/gcc43/meta/pkgdef
+++ b/gcc43/meta/pkgdef
@@ -28,7 +28,7 @@ $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include-fixed/curses.h
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/iso646.h
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include-fixed/limits.h
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include-fixed/math.h
-if(sunos56)$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include-fixed/memory.h
+if(sol26)$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include-fixed/memory.h
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include-fixed/pthread.h
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include-fixed/root
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include-fixed/stdarg.h
@@ -195,7 +195,6 @@ $iprefix/include/c++/${version}/map
 $iprefix/include/c++/${version}/memory
 $iprefix/include/c++/${version}/new
 $iprefix/include/c++/${version}/numeric
-$iprefix/include/c++/${version}/org/*
 $iprefix/include/c++/${version}/ostream
 $iprefix/include/c++/${version}/parallel/*
 $iprefix/include/c++/${version}/queue
@@ -207,7 +206,6 @@ $iprefix/include/c++/${version}/stack
 $iprefix/include/c++/${version}/stdexcept
 $iprefix/include/c++/${version}/streambuf
 $iprefix/include/c++/${version}/string
-$iprefix/include/c++/${version}/sun/*
 $iprefix/include/c++/${version}/tgmath.h
 $iprefix/include/c++/${version}/tr1/*
 $iprefix/include/c++/${version}/tr1_impl/*