From 035a819f7ba987b91258ccf87b76916948788304 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Mon, 13 Mar 2006 18:21:58 +0000
Subject: [PATCH] We still need some stuff from gnu-flags. Just remove the arch
 stuff

---
 hdf5-1.6.5-flags.patch | 86 ++++++++++++++++++++++++++----------------
 1 file changed, 53 insertions(+), 33 deletions(-)

diff --git a/hdf5-1.6.5-flags.patch b/hdf5-1.6.5-flags.patch
index 164b68e..2b5bcbe 100644
--- a/hdf5-1.6.5-flags.patch
+++ b/hdf5-1.6.5-flags.patch
@@ -1,36 +1,56 @@
---- hdf5-1.6.5/config/linux-gnulibc1.orig	2005-10-28 14:15:27.000000000 -0600
-+++ hdf5-1.6.5/config/linux-gnulibc1	2006-03-13 09:49:37.000000000 -0700
-@@ -25,14 +25,5 @@
-    CC_BASENAME=gcc
- fi
- 
--# Figure out GNU C compiler flags
--. $srcdir/config/gnu-flags
--
--# Figure out PGI C compiler flags
--. $srcdir/config/pgi-flags
+--- hdf5-1.6.5/config/gnu-flags.orig	2005-10-28 14:15:26.000000000 -0600
++++ hdf5-1.6.5/config/gnu-flags	2006-03-13 10:59:58.000000000 -0700
+@@ -107,25 +107,6 @@
+   gcc*|egcs*|pgcc*)
+     # Architecture-specific flags
+     arch=
+-    case "$host_os-$host_cpu" in
+-        # FreeBSD sets the information from "uname -m" to the general machine
+-        # architecture, not the specific CPU for the machine, so even our
+-        # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
+-        # machine, use the "sysctl" command to get the CPU hardware model.
+-        freebsd*-i386)
+-            host_cpu_model=`sysctl -n hw.model`
+-            case "$host_cpu_model" in
+-                # Hmm.. this might not catch Celerons, but it won't hurt them either...
+-                *Pro*|*II*|*III*|*IV*|*Athlon*)
+-                    arch="-march=i686"
+-                ;;
+-            esac
+-            ;;
 -
--# Figure out Intel C compiler flags
--. $srcdir/config/intel-flags
--
- # Check MPICH settings
- . $srcdir/config/mpich
---- hdf5-1.6.5/fortran/config/linux-gnulibc1.orig	2006-03-13 09:39:23.000000000 -0700
-+++ hdf5-1.6.5/fortran/config/linux-gnulibc1	2006-03-13 09:47:18.000000000 -0700
-@@ -25,16 +25,6 @@
-     CC_BASENAME=gcc
- fi
+-        *-i686)
+-            arch="-march=i686"
+-            ;;
+-    esac
  
--# Figure out GNU C compiler flags
--. $srcdir/config/gnu-flags
--
--# Figure out PGI C compiler flags
--. $srcdir/config/pgi-flags
+     # Host-specific flags
+     case "`hostname`" in
+--- hdf5-1.6.5/fortran/config/gnu-flags.orig	2005-10-28 14:57:02.000000000 -0600
++++ hdf5-1.6.5/fortran/config/gnu-flags	2006-03-13 10:59:22.000000000 -0700
+@@ -107,25 +107,6 @@
+   gcc*|egcs*|pgcc*)
+     # Architecture-specific flags
+     arch=
+-    case "$host_os-$host_cpu" in
+-        # FreeBSD sets the information from "uname -m" to the general machine
+-        # architecture, not the specific CPU for the machine, so even our
+-        # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
+-        # machine, use the "sysctl" command to get the CPU hardware model.
+-        freebsd*-i386)
+-            host_cpu_model=`sysctl -n hw.model`
+-            case "$host_cpu_model" in
+-                # Hmm.. this might not catch Celerons, but it won't hurt them either...
+-                *Pro*|*II*|*III*|*IV*|*Athlon*)
+-                    arch="-march=i686"
+-                ;;
+-            esac
+-            ;;
 -
--# Figure out Intel C compiler flags
--. $srcdir/config/intel-flags
--
--
- # The default Fortran 90 compiler
- if test "X-" = "X-$F9X"; then
-     case $CC_BASENAME in
+-        *-i686)
+-            arch="-march=i686"
+-            ;;
+-    esac
+ 
+     # Host-specific flags
+     case "`hostname`" in