[adios] 103/207: Update patch

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit 45f3d48fc2ecbd5d3c132f4d07f623936e059171
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 19 12:45:26 2014 +0100

    Update patch
---
 debian/patches/mpi4py_fix.patch | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/debian/patches/mpi4py_fix.patch b/debian/patches/mpi4py_fix.patch
index 05b8853..58a5663 100644
--- a/debian/patches/mpi4py_fix.patch
+++ b/debian/patches/mpi4py_fix.patch
@@ -1,15 +1,32 @@
-Index: adios-1.6.0/wrappers/numpy/adios.cpp
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fix for missing MPI_Message in MPI < 3
+Last-Updated: 2014-05-19
+Forwarded: no
+
+Index: adios-1.6.0/wrappers/numpy/adios.pyx
 ===================================================================
---- adios-1.6.0.orig/wrappers/numpy/adios.cpp
-+++ adios-1.6.0/wrappers/numpy/adios.cpp
-@@ -1,5 +1,10 @@
- /* Generated by Cython 0.19.1 on Tue Jul 16 14:56:11 2013 */
+--- adios-1.6.0.orig/wrappers/numpy/adios.pyx
++++ adios-1.6.0/wrappers/numpy/adios.pyx
+@@ -11,6 +11,8 @@ cimport numpy as np
+ import mpi4py.MPI as MPI 
+ cimport mpi4py.MPI as MPI
  
-+#if (MPI_VERSION < 3) && !defined(_MPI4PY_HAVE_MPI_MESSAGE)
++cdef extern from '../compat.h': pass
++
+ import cython
+ cimport cython
+ 
+Index: adios-1.6.0/wrappers/numpy/compat.h
+===================================================================
+--- /dev/null
++++ adios-1.6.0/wrappers/numpy/compat.h
+@@ -0,0 +1,9 @@
++/* Added to fix missing MPI_Message in older openmpi on Debian, etc
++ * Added mckinstry at debian.org, 2014-05-19
++ * This then included in adios.pxd
++ */
++
++#if (MPI_VERSION < 3) && !defined(PyMPI_HAVE_MPI_Message)
 +typedef void *PyMPI_MPI_Message;
 +#define MPI_Message PyMPI_MPI_Message
 +#endif
-+
- #define PY_SSIZE_T_CLEAN
- #ifndef CYTHON_USE_PYLONG_INTERNALS
- #ifdef PYLONG_BITS_IN_DIGIT

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