[SCM] hdf5 branch, upstream, updated. upstream/1.8.4-patch1-79-gbfcb1ff

[Sylvestre Ledru]

The following commit has been merged in the upstream branch:
commit 8e3d8c03573869cd6c61a4c3721b5f325d5dad04
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Thu Mar 10 13:15:04 2011 +0100

    Use the start flags + fix the fortran failure

diff --git a/debian/rules b/debian/rules
index 0f3bcad..0fb3172 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,7 @@ endif
 #    DEBOPT=-O0
 # endif
 ###
+FFLAGS+= $(DEBOPT) -m128bit-long-double
 
 export MPICH2_CC=$(DEBCC)
 export MPICH2_CLINKER=$(DEBCC)
@@ -112,7 +113,7 @@ configure-stamp-serial: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build-serial
 # configure serial version
-	cd debian/build-serial && CC=$(DEBCC) CXX=$(DEBCXX) F9X=$(DEBFORTRAN) CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
+	cd debian/build-serial && CC=$(DEBCC) CXX=$(DEBCXX) F9X=$(DEBFORTRAN) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
 		../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) 
 	touch $@
 
@@ -120,7 +121,7 @@ configure-stamp-openmpi: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build-openmpi
 # configure version with openmpi
-	cd debian/build-openmpi && CPPFLAGS=-I/usr/lib/openmpi/include CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
+	cd debian/build-openmpi && CPPFLAGS=-I/usr/lib/openmpi/include CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
 		CC=mpicc.openmpi F9X=mpif90.openmpi RUNPARALLEL=/usr/bin/mpirun.openmpi \
 		OMPI_MCA_disable_memory_allocator=1 ../../configure $(CONFIGURE_FLAGS) --enable-fortran \
 		--enable-parallel=yes
@@ -130,7 +131,7 @@ configure-stamp-mpich2: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build-mpich2
 # configure version with mpich2
-	cd debian/build-mpich2 && FCFLAGS=-I/usr/lib/mpich2/include/ CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
+	cd debian/build-mpich2 && FCFLAGS=-I/usr/lib/mpich2/include/ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
 		LDFLAGS=-L/usr/lib/mpich2/lib/ CC=mpicc.mpich2 \
 		CXX=mpiCC.mpich2 F9X=mpif90.mpich2 RUNPARALLEL=/usr/bin/mpirun.mpich2 \
 		../../configure $(CONFIGURE_FLAGS) --enable-fortran \

-- 
Hierarchical Data Format 5 (HDF5)