[adios] 08/11: * Build against all mpi versions again. * Link adios_mpi.so python packages against mpi libs

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/1.9.0-2
in repository adios.

commit dee3673f990db57b9750bb341449c22b8924df2b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 28 22:31:11 2015 +0000

    * Build against all mpi versions again.
    * Link adios_mpi.so python packages against mpi libs
---
 debian/changelog |  7 +++++++
 debian/control   |  2 +-
 debian/rules     | 25 +++++++++++++++++--------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b7cdc0..a5de771 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+adios (1.9.0-3) UNRELEASED; urgency=medium
+
+  * Build against all mpi versions again.
+  * Link adios_mpi.so python packages against mpi libs 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 28 Oct 2015 22:30:37 +0000
+
 adios (1.9.0-2) unstable; urgency=medium
 
   * Ensure pure mpich build is done; use mpif77.$(MPI_IMPL) 
diff --git a/debian/control b/debian/control
index 7534f19..33328df 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), 
   libnetcdf-dev, 
   gfortran, libmxml-dev, 
-  libmpich-dev,
+  mpi-default-dev,
   autotools-dev, cmake, libbz2-dev, zlib1g-dev, dh-autoreconf,
   libibverbs-dev [ !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
   python-dev, python-numpy, python-mpi4py, cython, dh-python,
diff --git a/debian/rules b/debian/rules
index 06ed598..fcb50ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,18 @@ ARCH:=$(shell dpkg --print-architecture)
 WITH_IBVERBS:= --with-ibverbs=/usr
 DO_TEST:= true
 
-MPI_IMPL:=mpich
-# MPI_IMPL should normally be $(ARCH_DEFAULT_MPI_IMPL) but due to a bug,
-# adios does not build with openmpi right now
+include /usr/share/mpi-default-dev/debian_defaults
+MPI=$(ARCH_DEFAULT_MPI_IMPL)
 
+# TODO: This should come from `pkg-config mpi --libs` ...
+ifeq ($(MPI), mpich)
+MPI_LIBS:= -Wl,-z,relro -lmpich -lopa -lmpl -lrt -lcr -lpthread
+endif
+if ($(MPI), openmpi)
+MPI_LIBS:= -L/usr/lib/openmpi/lib -L/usr//lib -lmpi_f90 -lmpi_f77 -lmpi 
+endif
+# TODO: also mpich2 for x32 ...
+#
 # Do tests on little-endian only for the moment;
 ifeq ($(ARCH), powerpc)
 #   DO_TEST:= false
@@ -30,7 +38,8 @@ ifeq ($(ARCH),kfreebsd-i386)
   WITH_IBVERBS:=
 endif
 
-DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+# TODO: also mpich2 for x32 ...
+# DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 DESTDIR:=$(shell pwd)/debian/tmp
 DEB_HOST_MULTIARCH:=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -63,11 +72,11 @@ override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) $(WITH_IBVERBS) --enable-shared \
 		--with-hdf5-incdir=/usr/include/hdf5/serial \
 		--with-hdf5-libdir=$(LIBDIR)/hdf5/serial \
-		--with-phdf5-incdir=/usr/include/hdf5/$(MPI_IMPL) \
-		--with-phdf5-libdir=$(LIBDIR)/hdf5/$(MPI_IMPL) \
+		--with-phdf5-incdir=/usr/include/hdf5/$(MPI) \
+		--with-phdf5-libdir=$(LIBDIR)/hdf5/$(MPI) \
 		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr \
-		--prefix=/usr MPICC=mpicc.$(MPI_IMPL) MPIFC=mpif77.$(MPI_IMPL) CFLAGS='$(CFLAGS) -I$(LIBDIR)/glib-2.0/include' \
-		LIBS=' -lpthread' 
+		--prefix=/usr MPICC=mpicc.$(MPI) MPIFC=mpif77.$(MPI) CFLAGS='$(CFLAGS) -I$(LIBDIR)/glib-2.0/include' \
+		LIBS=' $(MPI_LIBS) -lpthread' 
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git