- updated for 1.6.3

[packages/hdf5.git] / hdf5-config.patch

--- hdf5-1.6.0/config/commence.in.orig	2003-07-03 19:23:35.000000000 +0200
+++ hdf5-1.6.0/config/commence.in	2003-07-19 14:00:59.000000000 +0200
@@ -51,7 +51,7 @@
 LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(libdir) $(DYNAMIC_DIRS)
 LT_RUN=$(LT) --mode=execute
 LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
-LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
+LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_PROGRAM)
 LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
 
 ## Optional variables. We must declare them here because Irix pmake
--- hdf5-1.6.0/c++/config/commence.in.orig	2003-06-30 17:19:35.000000000 +0200
+++ hdf5-1.6.0/c++/config/commence.in	2003-07-19 14:01:16.000000000 +0200
@@ -50,11 +50,11 @@
 DYNAMIC_DIRS=@DYNAMIC_DIRS@
 LT=$(top_builddir)/libtool
 LT_COMPILE=$(LT) --mode=compile $(CXX)
-LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS)
-LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
+LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir) $(DYNAMIC_DIRS)
+LT_LINK_EXE=$(LT) --mode=link $(CXX) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
 LT_RUN=$(LT) --mode=execute
 LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
-LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
+LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_PROGRAM)
 LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
 
 ## Optional variables. We must declare them here because Irix pmake
--- 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 "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
-        ;;
-
-    *-i686)
-        arch="-march=i686"
-        ;;
-esac
-
 # Host-specific flags
 case "`hostname`" in
     sleipnir.ncsa.uiuc.edu)
@@ -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.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 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"
 
     # Flags are set
     cc_flags_set=yes