r47242 - in /packages/fenics/dolfin/trunk/debian: changelog control rules

[mattia at users.alioth.debian.org]

Author: mattia
Date: Thu Apr 21 15:34:02 2016
New Revision: 47242

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47242
Log:
Use OPENMPI_ARCHITECTURES from mpi-default-dev instead of hardcoding architectures where not to use openmpi

Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/control
    packages/fenics/dolfin/trunk/debian/rules

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=47242&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Thu Apr 21 15:34:02 2016
@@ -1,3 +1,10 @@
+dolfin (1.6.0-3) unstable; urgency=medium
+
+  * Use OPENMPI_ARCHITECTURES from mpi-default-dev instead of hardcoding
+    architectures where not to use openmpi.
+
+ -- Mattia Rizzolo <mattia at debian.org>  Thu, 21 Apr 2016 15:33:43 +0000
+
 dolfin (1.6.0-2) unstable; urgency=medium
 
   * Team upload.

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=47242&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control	(original)
+++ packages/fenics/dolfin/trunk/debian/control	Thu Apr 21 15:34:02 2016
@@ -27,6 +27,7 @@
  libvtk5-dev,
  libvtk5-qt4-dev,
  libxml2-dev,
+ mpi-default-dev,
  petsc-dev [!kfreebsd-amd64 !kfreebsd-i386],
  pkg-config,
  python-dev,

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=47242&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules	(original)
+++ packages/fenics/dolfin/trunk/debian/rules	Thu Apr 21 15:34:02 2016
@@ -1,22 +1,18 @@
 #!/usr/bin/make -f
-
-# FIXME: Is this needed?
-#CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-#CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-#CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
-#LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 # Allow test programs that uses OpenMPI to run
 export OMPI_MCA_plm_rsh_agent=/bin/false
 
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
+
 # Disable MPI on lam architectures
-ifeq ($(DEB_BUILD_ARCH), s390x)
+include /usr/share/mpi-default-dev/debian_defaults
+ifeq ($(findstring $(DEB_BUILD_ARCH),$(OPENMPI_ARCHITECTURES)),)
 ENABLE_MPI=OFF
 else
 ENABLE_MPI=ON
 endif
-
-DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 
 BUILDDIR = $(CURDIR)/debian/build
 DOLFIN_HOME = $(CURDIR)/$(DEB_SRCDIR)