[adios] 102/207: Fix for MPI_Message from MPI-3 not supported yet

[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 97302f99b80c624331b42d46255904334780a23a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 19 11:10:07 2014 +0100

    Fix for MPI_Message from MPI-3 not supported yet
---
 debian/patches/mpi4py_fix.patch | 15 +++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/patches/mpi4py_fix.patch b/debian/patches/mpi4py_fix.patch
new file mode 100644
index 0000000..05b8853
--- /dev/null
+++ b/debian/patches/mpi4py_fix.patch
@@ -0,0 +1,15 @@
+Index: adios-1.6.0/wrappers/numpy/adios.cpp
+===================================================================
+--- 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 */
+ 
++#if (MPI_VERSION < 3) && !defined(_MPI4PY_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
diff --git a/debian/patches/series b/debian/patches/series
index 2101a62..88a7b75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ security.patch
 netcdf-fix.patch
 python3.patch
 debian_paths.patch
+mpi4py_fix.patch
diff --git a/debian/rules b/debian/rules
index b1f6da9..718dae8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,7 @@ override_dh_auto_configure:
 	echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/x86_64-linux-gnu/python2.7" >> wrappers/numpy/build/CMakeCache.txt
 	echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython2.7.so" >> wrappers/numpy/build/CMakeCache.txt
 	echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build/CMakeCache.txt
+	echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build/CMakeCache.txt
 
 override_dh_auto_build:
 	dh_auto_build

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