[adios] 01/03: * Add SZIP support. * Remove hppa, x32 specific rules for mpich. Default to openmpi

[Alastair McKinstry]

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

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

commit 6b158c2a91adca4722c7b5da1b2d5937fe0dd018
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Mar 22 12:04:00 2016 +0000

    * Add SZIP support.
    * Remove hppa, x32 specific rules for mpich. Default to openmpi
---
 debian/changelog |  7 +++++++
 debian/control   |  3 ++-
 debian/rules     | 15 ++++-----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e53bd1f..6f8e27f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+adios (1.9.0-9) UNRELEASED; urgency=medium
+
+  * Add SZIP support.
+  * Remove hppa, x32 specific rules for mpich. Default to openmpi
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 22 Mar 2016 11:52:49 +0000
+
 adios (1.9.0-8) unstable; urgency=medium
 
   * Build s390x on openmpi default. Don't try to link against -lmpich.
diff --git a/debian/control b/debian/control
index 13ca2b5..54ed1e9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 9),
   libibverbs-dev [ !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
   python-dev, python-numpy, python-mpi4py, cython, dh-python,
   python3-all-dev, python3-numpy, python3-mpi4py, cython3,
-  libglib2.0-dev, libhdf5-serial-dev, libhdf5-mpi-dev
+  libglib2.0-dev, libhdf5-serial-dev, libhdf5-mpi-dev,
+  libaec-dev
 Build-Conflicts: libadios-dev, libadios-bin
 Standards-Version: 3.9.7
 Homepage: http://www.olcf.ornl.gov/center-projects/adios/
diff --git a/debian/rules b/debian/rules
index dfec1ee..8c6496f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,23 +9,16 @@ DO_TEST:= true
 include /usr/share/mpi-default-dev/debian_defaults
 MPI=$(ARCH_DEFAULT_MPI_IMPL)
 
+ifeq ($(MPI), openmpi)
+MPI_LIBS:= $(pkg-config mpi-fort --libs)
+else
 # TODO: This should come from `pkg-config mpi --libs` ...
-ifeq ($(MPI), mpich)
 MPI_LIBS:= -Wl,-z,relro -lmpich -lopa -lmpl -lrt -lcr -lpthread
-ifeq ($(ARCH),hppa)
-MPI_LIBS:= -Wl,-z,relro  -lmpich -lopa -lmpl  -lrt -lpthread
 endif
 ifeq ($(ARCH), m68k)
 MPI_LIBS:= -Wl,-z,relro -lmpich -lopa -lmpl -lrt -lpthread
 endif
-ifeq ($(ARCH), x32)
-MPI_LIBS:= -Wl,-z,relro -lmpich -lopa -lmpl -lrt -lpthread
-endif
-endif
 
-ifeq ($(MPI), openmpi)
-MPI_LIBS:= $(pkg-config mpi-fort --libs)
-endif
 ifeq ($(ARCH),hurd-i386)
   WITH_IBVERBS:=
 endif
@@ -73,7 +66,7 @@ override_dh_auto_configure:
 		--with-hdf5-libdir=$(LIBDIR)/hdf5/serial \
 		--with-phdf5-incdir=/usr/include/hdf5/$(MPI) \
 		--with-phdf5-libdir=$(LIBDIR)/hdf5/$(MPI) \
-		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr \
+		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr --with-szip=/usr \
 		--prefix=/usr MPICC=mpicc.$(MPI) MPIFC=mpif90.$(MPI) CFLAGS='$(CFLAGS) -I$(LIBDIR)/glib-2.0/include' \
 		LIBS=' $(MPI_LIBS) -lpthread' 
 

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