This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository netcdf4-python.
commit ff0ba8b974ef3bd393c897a0b57ec1891ebfe9cf Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Jul 29 20:29:29 2015 +0200 Use HDF5 mpich variant on s390x. --- debian/changelog | 6 ++++++ debian/rules | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6666131..d1bd0ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +netcdf4-python (1.1.8-3~exp3) UNRELEASED; urgency=medium + + * Use HDF5 mpich variant on s390x. + + -- Bas Couwenberg <sebas...@debian.org> Wed, 29 Jul 2015 20:26:57 +0200 + netcdf4-python (1.1.8-3~exp2) experimental; urgency=medium * Require at least libnetcdf-dev 4.3.3.1 for HDF5 openmpi variant. diff --git a/debian/rules b/debian/rules index 89fd092..03c315a 100755 --- a/debian/rules +++ b/debian/rules @@ -2,11 +2,20 @@ #DH_VERBOSE := 1 -export HDF5_INCDIR=/usr/include/hdf5/openmpi -export HDF5_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/openmpi +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -export MPI_INCDIR=/usr/lib/openmpi/include -export MPI_LIBDIR=/usr/lib/openmpi/lib +MPI_VARIANT = openmpi + +# 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/$(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 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