[xdmf] 03/38: WIP: devel

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository xdmf.

commit 8762c7e2eba47c6ff540a832b8c0045b38bb8cfb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Sep 12 13:02:55 2015 +0100

    WIP: devel
---
 debian/control | 11 ++++++-----
 debian/rules   | 47 ++++++++++++++++++++++++-----------------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/debian/control b/debian/control
index d537cfd..8589ce0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: xdmf
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 9), cmake(>= 2.4.0), 
-  libhdf5-dev,
-  libxml2-dev, python-all-dev, dh-python, gfortran, 
-  bzip2, libbz2-dev
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), cmake(>= 2.4.0), gfortran,
+  libhdf5-serial-dev, libdhf5-mpi-dev,
+  dh-python, python-all-dev, python3-all-dev,
+  libxml2-dev, bzip2, libbz2-dev
+Standards-Version: 3.9.6
 Homepage: http://www.xdmf.org/
 X-Python-Version: 2.7
+X-Python3-Version: 3.4+
 
 Package:  libxdmf2
 Provides: libxdmf2
diff --git a/debian/rules b/debian/rules
index 8967bb5..b54d737 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,38 +7,39 @@
 %:
 	dh $@ --buildsystem cmake --with python2,python3
 
+include /usr/share/mpi-default-dev/debian_defaults
+MPI:=$(ARCH_DEFAULT_MPI_IMPL)
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 TMPDIR=debian/tmp
 LIBDIR=usr/lib/${DEB_HOST_MULTIARCH}
-PY2VER:=$(shell pyversions -r)
-PY3VER:=$(shell py3versions -r)
-PYTHON_LIB:=/usr/lib/${DEB_HOST_MULTIARCH)}/lib${PY2VER}.so
-
-CXXFLAGS:= -I/usr/include/${PYVER} ${CXXFLAGS}
+PY3VER:=$(shell py3versions -s)
+PYTHON_LIB:=${LIBDIR}/libpython2.7.so
 
-# Later sort out doing serial + mpi builds ?
-# When the co-installable transition is complete, we will B-D on both
-# and build a libxdmf-mpi library too.
-ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
-  HDF5_INC := /usr/include/hdf5/serial
-  HDF5_LIB := /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so
-else
-  HDF5_INC := /usr/include
-  HDF5_LIB := /usr/lib/$(DEB_HOST_MULTIARCH)/libhdf5.so
-endif
+CXXFLAGS:= -I/usr/include/python2.7 ${CXXFLAGS}
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		-DXDMF_SYSTEM_ZLIB=ON -DXDMF_SYSTEM_LIBXML2=ON -DXDMF_USE_BZIP2=ON -DXDMF_USE_GZIP=ON \
+CMAKE_FLAGS:= -DXDMF_SYSTEM_ZLIB=ON -DXDMF_SYSTEM_LIBXML2=ON -DXDMF_USE_BZIP2=ON -DXDMF_USE_GZIP=ON \
 		-DXDMF_SYSTEM_HDF5=ON \
 		-DXDMF_USE_RPATH=OFF \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DXDMF_WRAP_PYTHON=ON \
+ 		-DPYTHON_INCLUDE_PATH="/usr/include/python2.7" \
+		-DPYTHON_LIBRARY=${PYTHON_LIB} 
+
+override_dh_auto_configure:
+	mkdir -p debian/build-mpi debian/build-serial
+	(cd debian/build-serial && cmake ../.. \
+		$(CMAKE_FLAGS) \
 		-DXDMF_BUILD_MPI=OFF \
- 		-DPYTHON_INCLUDE_PATH="/usr/include/${PYVER}" \
-		-DPYTHON_LIBRARY=${PYTHON_LIB} \
-		-DHDF5_INCLUDE_PATH=$(HDF5_INC) \
-		-DHDF5_LIBRARY=$(HDF5_LIB)
+		-DXDMF_SYSTEM_HDF5_IS_PARALLEL=OFF \
+  	        -DHDF5_INCLUDE_PATH=/usr/include/hdf5/serial \
+                -DHDF5_LIBRARY=$(LIBDIR)/hdf5/serial )
+	(cd debian/build-mpi && cmake ../.. \
+		$(CMAKE_FLAGS) \
+		-DXDMF_BUILD_MPI=ON \
+		-DXDMF_SYSTEM_HDF5_IS_PARALLEL=ON \
+  	        -DHDF5_INCLUDE_PATH=/usr/include/hdf5/$(MPI) \
+                -DHDF5_LIBRARY=$(LIBDIR)/hdf5/$(MPI) )
 
 # -DXDMF_SYSTEM_HDF5=ON -DXDMF_SYSTEM_HDF5_IS_PARALLEL=ON \
 
@@ -63,5 +64,5 @@ override_dh_auto_install:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f debian/cmake.patch
-	-find . -name CVS -exec rm -rf {} \;
+	rm -rf debian/build-*
 	

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