[SCM] hdf5 branch, master, updated. upstream/1.8.8-12-g8ca6d13
Sylvestre Ledru
sylvestre.ledru at scilab-enterprises.com
Tue Jan 17 19:23:55 UTC 2012
The following commit has been merged in the master branch:
commit 8ca6d1365716e7e46f47e949b55be68519db8d73
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date: Tue Jan 17 20:23:40 2012 +0100
hdf5 (1.8.8-2) UNRELEASED; urgency=low
* Fix an upstream wrong assumption that ia64 => ifort as Fortran compiler
Should fix both ia64 and sparc FTBFS
diff --git a/debian/changelog b/debian/changelog
index c95ad90..e30fa42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.8.8-2) UNRELEASED; urgency=low
+
+ * Fix an upstream wrong assumption that ia64 => ifort as Fortran compiler
+ Should fix both ia64 and sparc FTBFS
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 17 Jan 2012 20:21:02 +0100
+
hdf5 (1.8.8-1) unstable; urgency=low
* Upload in unstable
diff --git a/debian/rules b/debian/rules
index 22aee42..f3eb138 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,7 +114,7 @@ configure-stamp: configure-stamp-debian
dh_testdir
-mkdir debian/build
# configure serial version
- cd debian/build && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
+ cd debian/build && FC="gfortran" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS)
touch $@
@@ -122,7 +122,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="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
+ cd debian/build-openmpi && FC="gfortran" 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
@@ -132,7 +132,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="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
+ cd debian/build-mpich2 && FC="gfortran" FCFLAGS=-I/usr/lib/mpich2/include/ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
LDFLAGS=-L/usr/lib/mpich2/lib/ CC=mpicc.mpich2 \
CXX=mpicxx.mpich2 F9X=mpif90.mpich2 RUNPARALLEL=/usr/bin/mpirun.mpich2 \
../../configure $(CONFIGURE_FLAGS) --enable-fortran \
--
Hierarchical Data Format 5 (HDF5)
More information about the Pkg-grass-devel
mailing list