[Pkg-openmpi-commits] r387 - in /openmpi/trunk/debian: changelog libopenmpi1.10.install rules

[mckinstry at users.alioth.debian.org]

Author: mckinstry
Date: Thu Jun  2 12:23:10 2016
New Revision: 387

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=387
Log:
* Regression: liboshmem.so.8.1.0 not shipped. Closes: #825575
* Build against libfabric-dev where possible.
* Fix: bad regex check on list meant not building against verbs
  on some archs.

Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/libopenmpi1.10.install
    openmpi/trunk/debian/rules

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=387&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog	(original)
+++ openmpi/trunk/debian/changelog	Thu Jun  2 12:23:10 2016
@@ -1,3 +1,12 @@
+openmpi (1.10.2-15) unstable; urgency=medium
+
+  * Regression: liboshmem.so.8.1.0 not shipped. Closes: #825575
+  * Build against libfabric-dev where possible.
+  * Fix: bad regex check on list meant not building against verbs
+    on some archs.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 02 Jun 2016 06:44:30 +0100
+
 openmpi (1.10.2-14) unstable; urgency=medium
 
   * Standards-Version: 3.9.8. No changes required

Modified: openmpi/trunk/debian/libopenmpi1.10.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.10.install?rev=387&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.10.install	(original)
+++ openmpi/trunk/debian/libopenmpi1.10.install	Thu Jun  2 12:23:10 2016
@@ -8,6 +8,7 @@
 usr/lib/openmpi/lib/libompitrace.so.0.0.0
 usr/lib/openmpi/lib/libopen-pal.so.13.0.2
 usr/lib/openmpi/lib/libopen-rte.so.12.0.2
+/usr/lib/openmpi/lib/liboshmem.so.8.1.0
 ## Plugins
 usr/lib/openmpi/lib/openmpi/*.so
 ## Other files

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=387&op=diff
==============================================================================
--- openmpi/trunk/debian/rules	(original)
+++ openmpi/trunk/debian/rules	Thu Jun  2 12:23:10 2016
@@ -20,8 +20,13 @@
 
 # No ibverbs support available on kFreeBSD, Hurd
 NO_VERBS_ARCH:= "hurd-i386 kfreebsd-amd64 kfreebsd-i386 s390x"
-ifeq (,$(findstring $(DEB_HOST_ARCH),$(NO_VERBS_ARCH)))
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_VERBS_ARCH)))
         VERBS = --with-verbs
+endif
+
+FABRIC_ARCH:="amd64 i386"
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(VERBS_ARCH)))
+        FABRIC = --with-libfabric
 endif
 
 # Flags for the static build: see bug #502232
@@ -38,7 +43,7 @@
 override_dh_auto_configure:
 	./autogen.sh
 	dh_auto_configure -- \
-		$(NUMA) $(VERBS) \
+		$(NUMA) $(VERBS) $(FABRIC) \
 		$(MPI_THREADS) \
 		$(STATIC_CONFIG_PARAMS) \
 		--disable-silent-rules \