The following commit has been merged in the master branch:
commit abd47ec9b1fc222bc99ca4ea566aa1764d2e53f5
Author: Gilles Filippini <[email protected]>
Date: Thu Jan 9 22:35:37 2014 +0100
Drop unneeded mpi compilation and link flags
diff --git a/debian/changelog b/debian/changelog
index 5c1cccd..d8b462a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ hdf5 (1.8.12-5) UNRELEASED; urgency=medium
(closes: #734781).
* Bump Standards-Version to 3.9.5 (no changes).
+ * rules: drop unneeded compilation and link flags which are automatically
+ set by mpicc.
+
-- Gilles Filippini <[email protected]> Thu, 09 Jan 2014 20:20:01 +0100
hdf5 (1.8.12-4) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index 97c329c..fbaf10e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,9 +132,8 @@ 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 && 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; exit 1; }
touch $@
@@ -143,8 +142,8 @@ 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/
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
- LDFLAGS=-L/usr/lib/mpich/lib/ CC=mpicc.mpich \
+ cd debian/build-mpich && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
FFLAGS="$(FFLAGS)" \
+ CC=mpicc.mpich \
CXX=mpicxx.mpich FC=mpif90.mpich F9X=mpif90.mpich
RUNPARALLEL=/usr/bin/mpirun.mpich \
../../configure $(CONFIGURE_FLAGS) --enable-fortran \
--enable-parallel=yes || { cat config.log; exit 1; }
--
Hierarchical Data Format 5 (HDF5)
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
