[adios] 105/207: Ensure ibverbs, bzip2, hdf5 are properly included

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit 1e013cf0408bbffce93c407baf3ae1fc3386345b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 19 13:06:45 2014 +0100

    Ensure ibverbs, bzip2, hdf5 are properly included
---
 debian/control | 2 +-
 debian/rules   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 48d9277..ab0ab54 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), libnetcdf-dev, gfortran, libhdf5-mpi-dev | libhdf5-dev, libmxml-dev, 
-  mpi-default-dev, autotools-dev, cmake, libbz2-dev,
+  mpi-default-dev, autotools-dev, cmake, libbz2-dev, libibverbs-dev, 
   python-dev, python-numpy, python3-dev, cython,  dh-python, python-mpi4py
 Standards-Version: 3.9.5
 Homepage: http://www.olcf.ornl.gov/center-projects/adios/
diff --git a/debian/rules b/debian/rules
index 718dae8..c3347b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,8 @@ override_dh_auto_clean:
 	rm -fr wrappers/numpy/build wrappers/java/build
 
 override_dh_auto_configure:
-	dh_auto_configure --  $(WITH_LUSTRE) --enable-shared --prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC)
+	dh_auto_configure --  $(WITH_LUSTRE) --enable-shared \
+		--with-hdf5=/usr --with-bzip2=/usr --prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS='-fPIC'
 	# Prep python wrapper. Cache these for cmake otherwise it will get 2.7, 3.* confused
 	mkdir -p wrappers/numpy/build
 	echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build/CMakeCache.txt

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