[syrthes/master] Version 3.4.3-dfsg1-3
Gilles Filippini
pini at debian.org
Sun Feb 20 22:20:17 UTC 2011
Better MPI configuration with info from
/usr/share/mpi-default-dev/debian_defaults
---
debian/changelog | 7 +++++++
debian/rules | 12 +++++++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 64d2d60..f4035ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+syrthes (3.4.3-dfsg1-3) unstable; urgency=low
+
+ * debian/rules: ensure proper MPI configuration using the information
+ provided by mpi-default-dev in /usr/share/mpi-default-dev/debian_defaults
+
+ -- Gilles Filippini <pini at debian.org> Sun, 20 Feb 2011 21:02:21 +0100
+
syrthes (3.4.3-dfsg1-2) unstable; urgency=low
* Build-Depends: replace libhdf5-openmpi-dev with libhdf5-mpi-dev which
diff --git a/debian/rules b/debian/rules
index f3c699c..03b4ca8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,16 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
+# Which MPI implementation
+ifneq (,$(shell ls /usr/share/mpi-default-dev/debian_defaults))
+include /usr/share/mpi-default-dev/debian_defaults
+ifneq (,$(findstring $(ARCH_DEFAULT_MPI_IMPL),openmpi))
+INCMPI=/usr/include/openmpi
+else
+INCMPI=/usr/include/lam
+endif
+endif
+
SYRTHES_HOME=usr/lib/syrthes
INSTALL_DIR=$(CURDIR)/debian/syrthes
@@ -19,7 +29,7 @@ override_dh_auto_configure:
# Add here commands to compile the package.
cd $(CURDIR)/bin && SYRTHES_HOME=$(CURDIR) $(MAKE) install
# convert2syrthes
- make -C src/util/convert2syrthes MED="yes" INCMED="-I/usr/include/openmpi" LIBMED="-lmedC"
+ make -C src/util/convert2syrthes MED="yes" INCMED="-I$(INCMPI)" LIBMED="-lmedC"
touch $@
--
1.7.1
More information about the debian-science-commits
mailing list