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

Sylvestre Ledru sylvestre.ledru at scilab-enterprises.com
Tue Jan 31 13:45:56 UTC 2012


The following commit has been merged in the master branch:
commit 918fc8a81cba6a501eacbc42328eb80e28dd1d55
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Mon Jan 23 15:08:39 2012 +0100

    Display the config.log file if the configure fails

diff --git a/debian/rules b/debian/rules
index c604a76..8abe010 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) 
+		../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) || cat config.log
 	touch $@
 
 configure-stamp-openmpi: configure-stamp-debian
@@ -125,7 +125,7 @@ configure-stamp-openmpi: configure-stamp-debian
 	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 \
 		OMPI_MCA_disable_memory_allocator=1 ../../configure $(CONFIGURE_FLAGS) --enable-fortran \
-		--enable-parallel=yes
+		--enable-parallel=yes || cat config.log
 	touch $@
 
 configure-stamp-mpich2: configure-stamp-debian
@@ -136,7 +136,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
+		--enable-parallel=yes || cat config.log
 	touch $@
 
 prep: 

-- 
Hierarchical Data Format 5 (HDF5)



More information about the Pkg-grass-devel mailing list