[xdmf] 04/38: WIP: stash

[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 88e353ab568061281ec27fb06012811033f1fa14
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Oct 20 18:27:04 2015 +0100

    WIP: stash
---
 debian/control |  2 +-
 debian/rules   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 8589ce0..d3991ee 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), cmake(>= 2.4.0), gfortran,
-  libhdf5-serial-dev, libdhf5-mpi-dev,
+  libhdf5-serial-dev, libhdf5-mpi-dev,
   dh-python, python-all-dev, python3-all-dev,
   libxml2-dev, bzip2, libbz2-dev
 Standards-Version: 3.9.6
diff --git a/debian/rules b/debian/rules
index b54d737..33516ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 
 # The magic debhelper rule:
@@ -12,9 +12,10 @@ MPI:=$(ARCH_DEFAULT_MPI_IMPL)
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 TMPDIR=debian/tmp
-LIBDIR=usr/lib/${DEB_HOST_MULTIARCH}
+LIBDIR=/usr/lib/${DEB_HOST_MULTIARCH}
+PY2VER:=$(shall pyversions -s)
 PY3VER:=$(shell py3versions -s)
-PYTHON_LIB:=${LIBDIR}/libpython2.7.so
+PYTHON_LIB:=${LIBDIR}/lib${PY2VER}.so
 
 CXXFLAGS:= -I/usr/include/python2.7 ${CXXFLAGS}
 
@@ -23,7 +24,7 @@ CMAKE_FLAGS:= -DXDMF_SYSTEM_ZLIB=ON -DXDMF_SYSTEM_LIBXML2=ON -DXDMF_USE_BZIP2=ON
 		-DXDMF_USE_RPATH=OFF \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DXDMF_WRAP_PYTHON=ON \
- 		-DPYTHON_INCLUDE_PATH="/usr/include/python2.7" \
+ 		-DPYTHON_INCLUDE_PATH="/usr/include/${PY2VER}" \
 		-DPYTHON_LIBRARY=${PYTHON_LIB} 
 
 override_dh_auto_configure:
@@ -41,6 +42,10 @@ override_dh_auto_configure:
   	        -DHDF5_INCLUDE_PATH=/usr/include/hdf5/$(MPI) \
                 -DHDF5_LIBRARY=$(LIBDIR)/hdf5/$(MPI) )
 
+override_dh_auto_build:
+	$(MAKE) -C debian/build-serial
+	$(MAKE) -C debian/build-mpi
+
 # -DXDMF_SYSTEM_HDF5=ON -DXDMF_SYSTEM_HDF5_IS_PARALLEL=ON \
 
 # later, add -DXDMF_BUILD_UTILS=ON CMAKE_C_FLAGS_RELEASE="-O3 -NDEBUG" CMAKE_EXE_LINKER_FLAGS

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