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

[Francesco Paolo Lovergine]

The following commit has been merged in the upstream branch:
commit caaa160d14e5a87855e9e3205149718addec1be9
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 2 11:31:57 2010 +0000

    Turn optimization off.

diff --git a/debian/changelog b/debian/changelog
index 83600d3..f69898d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hdf5 (1.8.4-5) unstable; urgency=low
+
+  * Now forces optimization off (-O0) in debian/rules due to some known problems
+    with gcc 4.3+ for 1.8.4. This is required to override Debian build evnironment 
+    settings.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 02 Feb 2010 12:29:07 +0100
+
 hdf5 (1.8.4-4) unstable; urgency=low
 
   * New patch sigbus.diff to revert changes done in 1.8.4 for SIGBUS/SIGSEGV 
diff --git a/debian/rules b/debian/rules
index 240fdae..896df73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,8 @@ endif
     DEBCC=gcc
     DEBCXX=g++
     DEBFORTRAN=gfortran
+# With gcc 4.3+ force optimization off, else some tests fail...
+    DEBOPT=-O0
 # endif
 ###
 
@@ -120,7 +122,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) \
+	cd debian/build-serial && CC=$(DEBCC) CXX=$(DEBCXX) F9X=$(DEBFORTRAN) CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
 		../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) 
 	touch $@
 
@@ -128,7 +130,7 @@ configure-stamp-lam: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build-lam
 # configure version with lam
-	cd debian/build-lam && CPPFLAGS=-I/usr/include/lam \
+	cd debian/build-lam && CPPFLAGS=-I/usr/include/lam CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
 		CC=mpicc.lam RUNPARALLEL=/usr/bin/mpirun.lam \
 		../../configure $(CONFIGURE_FLAGS) \
 		--enable-parallel=yes
@@ -138,7 +140,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 \
+	cd debian/build-openmpi && CPPFLAGS=-I/usr/lib/openmpi/include CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
 		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
@@ -148,7 +150,7 @@ configure-stamp-mpich: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build-mpich
 # configure version with mpich
-	cd debian/build-mpich && FCFLAGS=-I/usr/lib/mpich/include/ \
+	cd debian/build-mpich && FCFLAGS=-I/usr/lib/mpich/include/ CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
 		LDFLAGS=-L/usr/lib/mpich/lib/ CC=mpicc.mpich \
 		CXX=mpiCC.mpich F9X=mpif90.mpich RUNPARALLEL=/usr/bin/mpirun.mpich \
 		../../configure $(CONFIGURE_FLAGS) --enable-fortran \

-- 
Hierarchical Data Format 5 (HDF5)