[Pkg-openmpi-commits] r339 - in /openmpi/trunk/debian: changelog patches/build_hurd

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Wed Aug 21 11:39:30 2013
New Revision: 339

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=339
Log:
Fix again the HURD build. Thanks to Pino Toscano (Closes: #720395)

Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/patches/build_hurd

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=339&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog	(original)
+++ openmpi/trunk/debian/changelog	Wed Aug 21 11:39:30 2013
@@ -1,3 +1,9 @@
+openmpi (1.6.5-4) unstable; urgency=low
+
+  * Fix again the HURD build. Thanks to Pino Toscano (Closes: #720395)
+
+ --
+
 openmpi (1.6.5-3) unstable; urgency=low
 
   * Increase the priority of the libopenmpi-dev package to make sure OpenMPI

Modified: openmpi/trunk/debian/patches/build_hurd
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/build_hurd?rev=339&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/build_hurd	(original)
+++ openmpi/trunk/debian/patches/build_hurd	Wed Aug 21 11:39:30 2013
@@ -1,8 +1,11 @@
 Description: Fix build problems on hurd-i386
  This patch allows Open MPI to build on Debian GNU/HURD.
+ .
+ Also, the memory:linux MCA component is disabled, since its use of POSIX API
+ in malloc hooks called very early at startup causes troubles.
 Author: Pino Toscano <pino at debian.org>
-Forwarded: yes
-Last-Update: 2013-08-15
+Forwarded: partially
+Last-Update: 2013-08-21
 
 --- a/ompi/runtime/ompi_mpi_abort.c
 +++ b/ompi/runtime/ompi_mpi_abort.c
@@ -274,3 +277,16 @@
  /* ////////////////////////////////////////////////////////////////////////// */
  /* local functions */
  static int
+--- a/opal/mca/memory/linux/configure.m4
++++ b/opal/mca/memory/linux/configure.m4
+@@ -58,6 +58,10 @@
+                  [memory_linux_ptmalloc2_happy=yes
+                   memory_linux_ummu_happy=no])])
+ 
++    AS_IF([echo "$host_os" | grep '^gnu' >/dev/null 2>/dev/null],
++          [memory_linux_ptmalloc2_happy=no
++           memory_linux_ummu_happy=no])
++
+     ######################################################################
+     # ptmalloc2
+     ######################################################################