[netcdf] 02/02: Also build netCDF library with parallel I/O support.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch mpi
in repository netcdf.

commit 51bc82145f3e77cf32f04b95cafaf1ef74e2e0c4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 4 21:05:39 2015 +0100

    Also build netCDF library with parallel I/O support.
---
 debian/changelog |  6 ++++++
 debian/control   | 41 ++++++++++++++++++++++++++++++++++++++++-
 debian/rules     | 23 +++++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 52736d7..915e839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+netcdf (1:4.4.0~rc5-1~exp2) UNRELEASED; urgency=medium
+
+  * Also build netCDF library with parallel I/O support.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 04 Dec 2015 20:13:56 +0100
+
 netcdf (1:4.4.0~rc5-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/control b/debian/control
index 4c3a4ad..bbb1f6f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,9 @@ Build-Depends: debhelper (>= 9),
                doxygen,
                libjs-jquery,
                libhdf5-dev (>= 1.8.6-1~),
-               libcurl4-gnutls-dev | libcurl-ssl-dev
+               libhdf5-mpi-dev (>= 1.8.6-1~),
+               libcurl4-gnutls-dev | libcurl-ssl-dev,
+               mpi-default-dev
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/netcdf.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/netcdf.git -b mpi
@@ -103,3 +105,40 @@ Description: Programs for reading and writing NetCDF files
  Together, the interface, library, and format support the creation,
  access, and sharing of scientific data.
 
+Package: libnetcdf-mpi7
+Architecture: any
+Section: libs
+Priority: extra
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: netCDF library with parallel I/O support
+ NetCDF (network Common Data Form) is an interface for scientific
+ data access and a freely-distributed software library that provides an
+ implementation of the interface.  The netCDF library also defines a
+ machine-independent format for representing scientific data.
+ Together, the interface, library, and format support the creation,
+ access, and sharing of scientific data.
+ .
+ This package contains the netCDF library with parallel I/O support.
+
+Package: libnetcdf-mpi-dev
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: libnetcdf-mpi7 (= ${binary:Version}),
+         libhdf5-mpi-dev (>= 1.8.6-1~),
+         libcurl4-gnutls-dev | libcurl-ssl-dev,
+         ${misc:Depends}
+Recommends: pkg-config
+Description: netCDF library with parallel I/O support - development files
+ NetCDF (network Common Data Form) is a set of interfaces for array-oriented
+ data access and a freely distributed collection of data access libraries for
+ C, Fortran, C++, Java, and other languages. The netCDF libraries support a
+ machine-independent format for representing scientific data. Together, the
+ interfaces, libraries, and format support the creation, access, and sharing of
+ scientific data.
+ .
+ This package provides the development files for the netCDF library with
+ parallel I/O support.
+
diff --git a/debian/rules b/debian/rules
index ce6478c..3d5fbe5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,10 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 HDF5_INCLUDE_PATH=/usr/include/hdf5/serial
 HDF5_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
 
+include /usr/share/mpi-default-dev/debian_defaults
+HDF5_MPI_INCLUDE_PATH=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+HDF5_MPI_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
 # Verbose test output
@@ -15,6 +19,10 @@ export VERBOSE=1
 %:
 	dh $@ --buildsystem=cmake --parallel
 
+override_dh_auto_clean:
+	dh_auto_clean
+	dh_auto_clean --builddirectory=build-mpi
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCMAKE_SKIP_RPATH:BOOL=OFF \
@@ -24,11 +32,26 @@ override_dh_auto_configure:
 		-DHDF5_INCLUDE_PATH=$(HDF5_INCLUDE_PATH) \
 		-DHDF5_LIBRARY_PATH=$(HDF5_LIBRARY_PATH)
 
+	dh_auto_configure --builddirectory=build-mpi -- \
+		-DCMAKE_C_COMPILER=mpicc \
+		-DCMAKE_SKIP_RPATH:BOOL=OFF \
+		-DCMAKE_VERBOSE_MAKEFILE=1 \
+		-DENABLE_TESTS:BOOL=ON \
+		-DENABLE_DOXYGEN:BOOL=ON \
+		-DHDF5_INCLUDE_PATH=$(HDF5_MPI_INCLUDE_PATH) \
+		-DHDF5_LIBRARY_PATH=$(HDF5_MPI_LIBRARY_PATH)
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --builddirectory=build-mpi
+
 override_dh_auto_test:
 	ARGS="--output-on-failure" dh_auto_test --max-parallel=1 || echo "Ignoring test failures"
+	ARGS="--output-on-failure" dh_auto_test --max-parallel=1 --builddirectory=build-mpi || echo "Ignoring test failures"
 
 override_dh_auto_install:
 	dh_auto_install
+	dh_auto_install --builddirectory=build-mpi -- DESTDIR=debian/tmp-mpi
 
 	$(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git