[SCM] hdf5 branch, master, updated. upstream/1.8.8-34-g91b73e7

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 91b73e79ec8e051d0b221eac9b2378fba18518a7
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Tue Jan 31 14:45:36 2012 +0100

    * Force the path to OpenMPI. This might fix the FTBFS on sparc.
    * Force to quit when the configure is failing. Thanks to
      Julien Cristau for the suggestion.

diff --git a/debian/changelog b/debian/changelog
index a084474..6bab2cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hdf5 (1.8.8-5) unstable; urgency=low
+
+  * Force the path to OpenMPI. This might fix the FTBFS on sparc.
+  * Force to quit when the configure is failing. Thanks to 
+    Julien Cristau for the suggestion.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 23 Jan 2012 18:16:53 +0100
+
 hdf5 (1.8.8-4) unstable; urgency=low
 
   * Update the symbol list under ia64
diff --git a/debian/rules b/debian/rules
index 8abe010..6ded8a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,7 @@ configure-stamp: configure-stamp-debian
 	-mkdir debian/build
 # configure serial version
 	cd debian/build && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" CXX=g++ FC=gfortran \
-		../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) || cat config.log
+		../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) || { cat config.log; exit 1; }
 	touch $@
 
 configure-stamp-openmpi: configure-stamp-debian
@@ -124,8 +124,9 @@ configure-stamp-openmpi: configure-stamp-debian
 # configure version with openmpi
 	cd debian/build-openmpi && CPPFLAGS=-I/usr/lib/openmpi/include CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
 		CC=mpicc.openmpi FC=mpif90.openmpi F9X=mpif90.openmpi RUNPARALLEL=/usr/bin/mpirun.openmpi \
+		LDFLAGS=-L/usr/lib/openmpi/lib/ \
 		OMPI_MCA_disable_memory_allocator=1 ../../configure $(CONFIGURE_FLAGS) --enable-fortran \
-		--enable-parallel=yes || cat config.log
+		--enable-parallel=yes || { cat config.log; exit 1; }
 	touch $@
 
 configure-stamp-mpich2: configure-stamp-debian
@@ -136,7 +137,7 @@ configure-stamp-mpich2: configure-stamp-debian
 		LDFLAGS=-L/usr/lib/mpich2/lib/ CC=mpicc.mpich2 \
 		CXX=mpicxx.mpich2 FC=mpif90.mpich2 F9X=mpif90.mpich2 RUNPARALLEL=/usr/bin/mpirun.mpich2 \
 		../../configure $(CONFIGURE_FLAGS) --enable-fortran \
-		--enable-parallel=yes || cat config.log
+		--enable-parallel=yes || { cat config.log; exit 1; }
 	touch $@
 
 prep: 

-- 
Hierarchical Data Format 5 (HDF5)