[tachyon] 03/04: Use the list of openmpi architectures as provided by mpi-default-dev, instead of hardcoding our own list. Tight build-dep on mpi-default-dev (>= 1.3)

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository tachyon.

commit 1ec30fa17e65cc5650ee82d8b2b6f1d3f380a84e
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Feb 29 13:37:07 2016 +0000

    Use the list of openmpi architectures as provided by mpi-default-dev, instead of hardcoding our own list.  Tight build-dep on mpi-default-dev (>= 1.3)
---
 debian/control              | 10 +++++-----
 debian/rules                | 10 ++++------
 debian/templates/control.in |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 63d5328..74f07f0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
  debhelper (>= 9),
  autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
- mpi-default-dev,
+ mpi-default-dev (>= 1.3),
  libmpich-dev,
  libjpeg-dev,
  libpng-dev,
@@ -78,7 +78,7 @@ Package: libtachyon-serial-0-dbg
 Provides: libtachyon-dbg
 Section: debug
 Priority: extra
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32
 Depends: libtachyon-serial-0 (= ${binary:Version}), ${misc:Depends}
 Multi-Arch: same
 Description: Parallel/Multiprocessor Ray Tracing Library - debug package - serial flavour
@@ -174,7 +174,7 @@ Package: libtachyon-openmpi-0
 Provides: libtachyon
 Section: libs
 Priority: extra
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: tachyon-doc
@@ -201,7 +201,7 @@ Package: libtachyon-openmpi-0-dev
 Provides: libtachyon-dev
 Section: libdevel
 Priority: extra
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32
 Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-openmpi-0 (= ${binary:Version}), ${misc:Depends}
 Multi-Arch: same
 Description: Parallel/Multiprocessor Ray Tracing Library - development - OpenMPI flavour
@@ -225,7 +225,7 @@ Package: libtachyon-openmpi-0-dbg
 Provides: libtachyon-dbg
 Section: debug
 Priority: extra
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32
 Depends: libtachyon-openmpi-0 (= ${binary:Version}), ${misc:Depends}
 Multi-Arch: same
 Description: Parallel/Multiprocessor Ray Tracing Library - debug package - OpenMPI flavour
diff --git a/debian/rules b/debian/rules
index 08ad8d9..5d006b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,18 +26,16 @@ DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR = \
 	$(sort $(foreach var, $(DEB_VIRT_LIBTACHYON_LISTOF_VARIANT), $(firstword $(subst -, $(EMPTY), $(var)))))
 #
 
-DEB_ARCH_REVLISTOF_OPENMPI ?= \
-	alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe \
-	ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 \
-	hurd-i386 mips64 mips64el mips mipsel
-DEB_ARCH_REVLISTOF_MPICH ?= any
-
 ifneq (,$(wildcard /usr/share/mpi-default-dev/debian_defaults))
 include /usr/share/mpi-default-dev/debian_defaults
 DEB_ARCH_DEFAULT_MPI_IMPL = $(ARCH_DEFAULT_MPI_IMPL)
+DEB_ARCH_REVLISTOF_OPENMPI ?= $(strip $(OPENMPI_AVAILABLE_ARCHITECTURES))
 else
 DEB_ARCH_DEFAULT_MPI_IMPL = mpich
+DEB_ARCH_REVLISTOF_OPENMPI ?= any
 endif
+DEB_ARCH_REVLISTOF_MPICH ?= any
+
 
 ## inspired from mpfr material
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
diff --git a/debian/templates/control.in b/debian/templates/control.in
index 52b25c1..fe0467b 100644
--- a/debian/templates/control.in
+++ b/debian/templates/control.in
@@ -6,7 +6,7 @@ Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
  debhelper (>= 9),
  autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
- mpi-default-dev,
+ mpi-default-dev (>= 1.3),
  libmpich-dev,
  libjpeg-dev,
  libpng-dev,

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