This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository netcdf4-python.
commit ffae7f27d8576513f6dfa3bb0f62f812ede7d1d8 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Jul 30 20:54:34 2015 +0200 Use mpi-default-dev to select the architecture specific HDF5 MPI flavor. --- debian/changelog | 6 ++++++ debian/control | 1 + debian/rules | 17 ++++++----------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 421b45c..d5df534 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +netcdf4-python (1.1.8-3~exp4) UNRELEASED; urgency=medium + + * Use mpi-default-dev to select the architecture specific HDF5 MPI flavor. + + -- Bas Couwenberg <sebas...@debian.org> Thu, 30 Jul 2015 20:31:45 +0200 + netcdf4-python (1.1.8-3~exp3) experimental; urgency=medium * Use HDF5 mpich variant on s390x. diff --git a/debian/control b/debian/control index 154601d..d85f9c1 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 9), cython, libhdf5-dev, libnetcdf-dev (>= 1:4.3.3.1), + mpi-default-dev, chrpath Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/netcdf4-python.git/ diff --git a/debian/rules b/debian/rules index 03c315a..94f200b 100755 --- a/debian/rules +++ b/debian/rules @@ -2,20 +2,15 @@ #DH_VERBOSE := 1 -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -MPI_VARIANT = openmpi +include /usr/share/mpi-default-dev/debian_defaults -# mpich is the default variant for HDF5 on s390x -ifneq (,$(findstring $(DEB_HOST_ARCH),"s390x")) - MPI_VARIANT = mpich -endif +export HDF5_INCDIR=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) +export HDF5_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) -export HDF5_INCDIR=/usr/include/hdf5/$(MPI_VARIANT) -export HDF5_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(MPI_VARIANT) - -export MPI_INCDIR=/usr/lib/$(MPI_VARIANT)/include -export MPI_LIBDIR=/usr/lib/$(MPI_VARIANT)/lib +export MPI_INCDIR=/usr/lib/$(ARCH_DEFAULT_MPI_IMPL)/include +export MPI_LIBDIR=/usr/lib/$(ARCH_DEFAULT_MPI_IMPL)/lib export USE_NCCONFIG=1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf4-python.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel