- updated for 1.6.3

Changed files:
    hdf5-config.patch -> 1.7

diff --git a/hdf5-config.patch b/hdf5-config.patch
index 572b2fc5542ac94b6d5a6aaec7c08af16103f22a..f95e9a98a490145a9941127b91591763d2d60962 100644 (file)
--- a/hdf5-config.patch
+++ b/hdf5-config.patch
@@ -26,87 +26,96 @@
  LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
  
  ## Optional variables. We must declare them here because Irix pmake
---- hdf5-1.6.2/config/gnu-flags.orig   2004-01-28 01:26:17.000000000 +0100
-+++ hdf5-1.6.2/config/gnu-flags        2004-03-06 17:40:53.557597768 +0100
-@@ -89,27 +89,6 @@
- 
+--- hdf5-1.6.3/config/gnu-flags.orig   2004-07-15 23:56:54.000000000 +0200
++++ hdf5-1.6.3/config/gnu-flags        2004-10-25 00:37:36.704824744 +0200
+@@ -90,27 +90,6 @@
  fi
  
+ arch=
 -# Architecture-specific flags
 -case "$host_os-$host_cpu" in
--    # FreeBSD sets the information from "hostname -m" to the general machine
+-    # 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*)
+-    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=${ARCH:="-march=i686"}
+-                arch="-march=i686"
 -            ;;
 -        esac
 -        ;;
 -
 -    *-i686)
--        ARCH=${ARCH:="-march=i686"}
+-        arch="-march=i686"
 -        ;;
 -esac
 -
  # Host-specific flags
  case "`hostname`" in
      sleipnir.ncsa.uiuc.edu)
-@@ -131,7 +110,7 @@
-       # Production
-         case "$cc_vendor-$cc_version" in
-             gcc-2.95.[34])
--                PROD_CFLAGS="-O3 $NOFP"
-+                PROD_CFLAGS="$NOFP"
-                 ;;
-             gcc-3.[0-4]*)
-                 # The optimization level is reduced for gcc 3.* due to problems
-@@ -140,14 +119,14 @@
-                 # failures for various integer types -> long long conversions in the
-                 # test/dtypes test).  Perhaps later versions of gcc will fix this
-                 # bug... - QAK - 2003/10/20
--                PROD_CFLAGS="-O $NOFP"
-+                PROD_CFLAGS="$NOFP"
-                 ;;
-             gcc-3*)
-                 # Be optimistic about future versions of gcc.. :-) - QAK - 2003/10/20
--                PROD_CFLAGS="-O3 $NOFP"
-+                PROD_CFLAGS="$NOFP"
-                 ;;
-             *)
--                PROD_CFLAGS="-O $NOFP -finline-functions"
-+                PROD_CFLAGS="$NOFP -finline-functions"
-                 ;;
-         esac
-       PROD_CPPFLAGS=
-@@ -176,7 +155,7 @@
-       CFLAGS="$CFLAGS -Wno-long-long"
+@@ -127,7 +106,7 @@
+     # Production
+     case "$cc_vendor-$cc_version" in
+       gcc-2.95.[34])
+-        PROD_CFLAGS="-O3 $NOFP"
++        PROD_CFLAGS="$NOFP"
+         ;;
+       gcc-3.[0-4]*)
+         # The optimization level is reduced for gcc 3.* due to problems
+@@ -136,14 +115,14 @@
+         # failures for various integer types -> long long conversions in the
+         # test/dtypes test).  Perhaps later versions of gcc will fix this
+         # bug... - QAK - 2003/10/20
+-        PROD_CFLAGS="-O $NOFP"
++        PROD_CFLAGS="$NOFP"
+         ;;
+       gcc-3*)
+         # Be optimistic about future versions of gcc.. :-) - QAK - 2003/10/20
+-        PROD_CFLAGS="-O3 $NOFP"
++        PROD_CFLAGS="$NOFP"
+         ;;
+       *)
+-        PROD_CFLAGS="-O $NOFP"
++        PROD_CFLAGS="$NOFP"
+         ;;
+     esac
+ 
+@@ -173,7 +152,7 @@
+     CFLAGS="$CFLAGS -Wno-long-long"
+ 
+     # Append warning flags from gcc-3* case
+-    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
++    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+ 
+     # Append warning flags from gcc-3.2* case
+     CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+@@ -203,7 +182,7 @@
+     CFLAGS="$CFLAGS -Wno-long-long"
  
-         # Append warning flags from gcc-3* case
--      CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+      CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+     # Append warning flags from gcc-3* case
+-    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
++    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
  
-         # Append warning flags from gcc-3.2* case
-       CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-@@ -201,7 +180,7 @@
-       CFLAGS="$CFLAGS -Wno-long-long"
+     # Append warning flags from gcc-3.2* case
+     CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+@@ -230,7 +209,7 @@
+     CFLAGS="$CFLAGS -Wno-long-long"
  
-         # Append warning flags from gcc-3* case
--      CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+      CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+     # Append warning flags from gcc-3* case
+-    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
++    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
  
-         # Append more extra warning flags that only gcc3.2+ know about
-       CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-@@ -223,7 +202,7 @@
-       CFLAGS="$CFLAGS -Wno-long-long"
+     # Append more extra warning flags that only gcc3.2+ know about
+     CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+@@ -254,7 +233,7 @@
+     CFLAGS="$CFLAGS -Wno-long-long"
  
-         # Append some extra warning flags that only gcc3+ know about
--      CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+      CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+     # Append some extra warning flags that only gcc3+ know about
+-    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
++    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
  
-       # Flags are set
-       cc_flags_set=yes
+     # Flags are set
+     cc_flags_set=yes