Bug#768033: unblock: openmpi/1.4.2-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package openmpi
This Fixes two important bugs: #647908 and #675115 that block the package
from working with gfortran-4.9 (used by many/most users) and
#752785 enables functionality via mpi.pc to work across all MPI implementations
in Jessie.
unblock openmpi/1.6.5-9
-- System Information:
Debian Release: 7.6
APT prefers stable
APT policy: (500, 'stable')
Architecture: powerpc (ppc)
Kernel: Linux 2.6.32-5-powerpc
Locale: LANG=C, LC_CTYPE=C (charmap=UTF-8) (ignored: LC_ALL set to ga_IE.UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru openmpi-1.6.5/debian/changelog openmpi-1.6.5/debian/changelog
--- openmpi-1.6.5/debian/changelog 2013-12-26 13:36:20.000000000 +0000
+++ openmpi-1.6.5/debian/changelog 2014-10-28 11:19:58.000000000 +0000
@@ -1,3 +1,14 @@
+openmpi (1.6.5-9) unstable; urgency=medium
+
+ * Add myself as uploader.
+ * Standards-Version: 3.9.6; no changes required.
+ * Rebuild against lastest gfortran. Closes: #647908, #675115.
+ * Patch for mpi.pc support. Closes: #752785.
+ * Patch from Michael Cree to fix bad atomic ops on Alpha that
+ causes mpi4py to segfault. Closes: #754524.
+
+ -- Alastair McKinstry <mckinstry@debian.org> Tue, 28 Oct 2014 11:07:44 +0000
+
openmpi (1.6.5-8) unstable; urgency=low
[ Dimitri John Ledkov ]
diff -Nru openmpi-1.6.5/debian/control openmpi-1.6.5/debian/control
--- openmpi-1.6.5/debian/control 2013-12-26 14:31:53.000000000 +0000
+++ openmpi-1.6.5/debian/control 2014-10-28 11:07:40.000000000 +0000
@@ -2,7 +2,8 @@
Section: net
Priority: extra
Maintainer: Debian Open MPI Maintainers <pkg-openmpi-maintainers@lists.alioth.debian.org>
-Uploaders: Manuel Prinz <manuel@debian.org>, Sylvestre Ledru <sylvestre@debian.org>
+Uploaders: Manuel Prinz <manuel@debian.org>, Sylvestre Ledru <sylvestre@debian.org>,
+ Alastair McKinstry <mckinstry@debian.org>
Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.0.0~),
libibverbs-dev (>= 1.1.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
gfortran, gcc (>= 4:4.1.2), chrpath, libhwloc-dev, libtorque2-dev,
@@ -10,7 +11,7 @@
libnuma-dev [amd64 i386 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64el], autoconf (>= 2.59),
automake
Build-Conflicts: libopenmpi1.3
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.open-mpi.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
diff -Nru openmpi-1.6.5/debian/patches/alpha_badatomic.patch openmpi-1.6.5/debian/patches/alpha_badatomic.patch
--- openmpi-1.6.5/debian/patches/alpha_badatomic.patch 1970-01-01 01:00:00.000000000 +0100
+++ openmpi-1.6.5/debian/patches/alpha_badatomic.patch 2014-10-28 11:24:32.000000000 +0000
@@ -0,0 +1,26 @@
+Index: openmpi-1.6.5/opal/include/opal/sys/alpha/atomic.h
+===================================================================
+--- openmpi-1.6.5.orig/opal/include/opal/sys/alpha/atomic.h
++++ openmpi-1.6.5/opal/include/opal/sys/alpha/atomic.h
+@@ -96,9 +96,7 @@ static inline int opal_atomic_cmpset_32(
+ "mov %3, %0 \n\t"
+ "stl_c %0, %1 \n\t"
+ "beq %0, 1b \n\t"
+- "jmp 3f \n"
+- "2: mov $31, %0 \n"
+- "3: \n"
++ "2: \n"
+ : "=&r" (ret), "+m" (*addr)
+ : "r" (oldval), "r" (newval)
+ : "memory");
+@@ -141,9 +139,7 @@ static inline int opal_atomic_cmpset_64(
+ "mov %3, %0 \n\t"
+ "stq_c %0, %1 \n\t"
+ "beq %0, 1b \n\t"
+- "jmp 3f \n"
+- "2: mov $31, %0 \n"
+- "3: \n"
++ "2: \n"
+ : "=&r" (ret), "+m" (*addr)
+ : "r" (oldval), "r" (newval)
+ : "memory");
diff -Nru openmpi-1.6.5/debian/patches/pkgconfig-vars.patch openmpi-1.6.5/debian/patches/pkgconfig-vars.patch
--- openmpi-1.6.5/debian/patches/pkgconfig-vars.patch 1970-01-01 01:00:00.000000000 +0100
+++ openmpi-1.6.5/debian/patches/pkgconfig-vars.patch 2014-10-28 12:51:59.000000000 +0000
@@ -0,0 +1,28 @@
+Author: Alastair McKinstry <mckinstry@debian.org>
+Origin-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752785
+Description: Add variables needed to make mpi.pc an alias for ompi.pc
+Last-Updated: 2014-10-07
+Forwarded: no
+
+Index: openmpi-1.6.5/ompi/tools/wrappers/ompi.pc.in
+===================================================================
+--- openmpi-1.6.5.orig/ompi/tools/wrappers/ompi.pc.in
++++ openmpi-1.6.5/ompi/tools/wrappers/ompi.pc.in
+@@ -15,7 +15,7 @@ libdir=@libdir@
+ # dependencies), so only list these in Libs.private.
+ #
+ Libs: -L${libdir} @OMPI_WRAPPER_EXTRA_LDFLAGS@ -lmpi
+-Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
++Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@ -lmpi_f90 -lmpi_f77 -lmpi
+ #
+ # It is safe to hard-wire the -I before the EXTRA_INCLUDES because it
+ # will either contain "openmpi" or be blank. Hence, it'll either
+@@ -23,3 +23,8 @@ Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
+ # redundant (ick), but safe.
+ #
+ Cflags: -I${includedir} -I${includedir}/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@
++#
++# Add variables to be queried in specific cases. Match variables in mpich.pc
++cxxflags= -I -I/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CXXFLAGS@
++fcflags= -I -I/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@
++fflags= -I -I/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FFLAGS@
diff -Nru openmpi-1.6.5/debian/patches/series openmpi-1.6.5/debian/patches/series
--- openmpi-1.6.5/debian/patches/series 2013-12-26 13:28:41.000000000 +0000
+++ openmpi-1.6.5/debian/patches/series 2014-10-28 11:17:06.000000000 +0000
@@ -16,3 +16,5 @@
mips-support-fix.diff
basic-arm64-support.diff
ppc64el-support.patch
+alpha_badatomic.patch
+pkgconfig-vars.patch
Reply to: