From c6e6c27c5faea5e87a2ac7d5448b86d018c45b78 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sat, 5 Sep 2009 15:16:39 +0000
Subject: [PATCH] Update to 4.3.4

---
 gcc43/build.sh    | 31 +++++++++++++++++++++++++------
 gcc43/meta/pkgdef | 10 +++++-----
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/gcc43/build.sh b/gcc43/build.sh
index ddcb7c7..88951a6 100755
--- a/gcc43/build.sh
+++ b/gcc43/build.sh
@@ -1,8 +1,22 @@
 #!/bin/bash
-#
-# This is a generic build.sh script
-# It can be used nearly unmodified with many packages
-# 
+# This is a buildpkg build.sh script
+# Copyright (C) 2003-2009 Tom G. Christensen <tgc@jupiterrise.com>
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Written by Tom G. Christensen <tgc@jupiterrise.com>.
+
 # build.sh helper functions
 . ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
@@ -10,7 +24,7 @@
 # Check the following 4 variables before running the script
 snapshot=
 topdir=gcc
-version=4.3.3
+version=4.3.4
 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
@@ -38,7 +52,7 @@ objdir=all_native
 # platform/arch specific options
 [ "$_os" = "sunos56" ] && platform_configure_args="--enable-threads=posix95 --enable-obsolete"
 [ "$_os" = "sunos56" -a "$arch" = "i386" ] && platform_configure_args="$platform_configure_args --with-gnu-as --with-as=$lprefix/bin/gas"
-[ "$arch" = "sparc" ] && { vendor="sun"; sparc=1; } || vendor="pc"
+[ "$arch" = "sparc" ] && { vendor="sun"; sparc=1; } || { vendor="pc"; intel=1; }
 
 configure_args="$global_config_args $langs $platform_configure_args"
 
@@ -94,18 +108,23 @@ install()
 	compat $pkg 4.2.4 1 2
 	compat $pkg 4.3.1 1 2
 	compat $pkg 4.3.2 1 2
+	compat $pkg 4.3.3 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 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 libgfortran3 4.3.1 1 2
     compat libgfortran3 4.3.2 1 2
+    compat libgfortran3 4.3.3 1 2
     compat libgnat43 4.3.2 1 2
+    compat libgnat43 4.3.3 1 2
 }
 
 reg check
diff --git a/gcc43/meta/pkgdef b/gcc43/meta/pkgdef
index e7bc7b2..963c034 100644
--- a/gcc43/meta/pkgdef
+++ b/gcc43/meta/pkgdef
@@ -84,11 +84,11 @@ $iprefix/man/?a?1/gcov.1
 $iprefix/man/?a?7/*.7
 $_sharedir
 # Only on i386
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/*intrin.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/cpuid.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mmintrin-common.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mm3dnow.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mm_malloc.h
+if(intel)$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/*intrin.h
+if(intel)$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/cpuid.h
+if(intel)$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mmintrin-common.h
+if(intel)$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mm3dnow.h
+if(intel)$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mm_malloc.h
 
 [gcc-gnat]
 pkgname="${pkgprefix}g${abbrev_ver}gn"