[SCM] hdf5 branch, master, updated. debian/1.8.12-2-7-g5bac55a

[Gilles Filippini]

The following commit has been merged in the master branch:
commit 4fa4231d356939948728df52ee6412c9e5ad41ad
Author: Gilles Filippini <pini at debian.org>
Date:   Tue Dec 31 10:54:48 2013 +0100

    debian/rules: simplify build_openmpi detection
    
    depending on arch.

diff --git a/debian/changelog b/debian/changelog
index 2146447..4e86776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ hdf5 (1.8.12-3) UNRELEASED; urgency=medium
 
   * debian/rules:
     + Simplify DEFAULT_MPI retrieval
-    + Enable arch arm64 to be consistent with debian/control
+    + Simplify build_openmpi detection depending on arch
+    + Enable arch arm64 for openmpi to be consistent with debian/control
 
  -- Gilles Filippini <pini at debian.org>  Tue, 31 Dec 2013 10:41:51 +0100
 
diff --git a/debian/rules b/debian/rules
index 36ac34e..79d2361 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,23 +38,7 @@ DEFAULT_MPI=$(ARCH_DEFAULT_MPI_IMPL)
 ARCH_FLAG=-s
 ARCHS=alpha arm64 armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
 
-ifeq ($(DEB_HOST_ARCH),arm)
-build_openmpi = no
-else ifeq ($(DEB_HOST_ARCH),arm64)
-build_openmpi = no
-else ifeq ($(DEB_HOST_ARCH),hppa)
-build_openmpi = no
-else ifeq ($(DEB_HOST_ARCH),m68k)
-build_openmpi = no
-else ifeq ($(DEB_HOST_ARCH),mips)
-build_openmpi = no
-else ifeq ($(DEB_HOST_ARCH),mipsel)
-build_openmpi = no
-else ifeq ($(DEB_HOST_ARCH),s390)
-build_openmpi = no
-else ifeq ($(DEB_HOST_ARCH),s390x)
-build_openmpi = no
-else ifeq ($(DEB_HOST_ARCH),sh4)
+ifeq (,$(filter $(DEB_HOST_ARCH),$(ARCHS)))
 build_openmpi = no
 else
 build_openmpi = yes

-- 
Hierarchical Data Format 5 (HDF5)