[adios] 147/207: Build MPI versions of python libs too

[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 d64ed70dbc86ac1d2d5a057d6f04e40353bdb9fb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 16 10:12:08 2014 +0100

    Build MPI versions of python libs too
---
 debian/patches/python3.patch       |  21 +++++++++++++++++++++
 debian/rules                       |   1 +
 wrappers/numpy/conf/__init__.pyc   | Bin 149 -> 143 bytes
 wrappers/numpy/conf/mpiregexes.pyc | Bin 2495 -> 2475 bytes
 wrappers/numpy/conf/mpiscanner.pyc | Bin 15203 -> 14763 bytes
 5 files changed, 22 insertions(+)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index e566334..830e6d8 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -692,3 +692,24 @@ Index: adios-1.7.0/wrappers/numpy/setup.py
      if path.startswith('-L'):
          m1.library_dirs.append(path.replace('-L', '', 1))
      if path.startswith('-l'):
+Index: adios-1.7.0/wrappers/numpy/setup_mpi.py
+===================================================================
+--- adios-1.7.0.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.7.0/wrappers/numpy/setup_mpi.py
+@@ -20,12 +20,14 @@ m1 = Extension('adios_mpi',
+                extra_objects = [])
+ 
+ p = subprocess.Popen(["adios_config", "-c"], stdout=subprocess.PIPE)
+-for path in p.communicate()[0].strip().split(" "):
++pp = p.communicate()[0].strip()
++for path in str(pp).split(" "):
+     if path.startswith('-I'):
+         m1.include_dirs.append(path.replace('-I', '', 1))
+ 
+ p = subprocess.Popen(["adios_config", "-l"], stdout=subprocess.PIPE)
+-for path in p.communicate()[0].strip().split(" "):
++pp = p.communicate()[0].strip()
++for path in str(pp).split(" "):
+     if path.startswith('-L'):
+         m1.library_dirs.append(path.replace('-L', '', 1))
+     if path.startswith('-l'):
diff --git a/debian/rules b/debian/rules
index 13debce..c7962c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,6 +83,7 @@ override_dh_auto_build:
 	# Now build Python wrapper. Uses adios_config and the debian/tmp install.
 	for p in ${PY2} ${PY3VERS} ; do \
 		( cd wrappers/numpy && PATH=$(TOP):$(PATH) $$p ./setup.py install --prefix=$(TOP)/debian/tmp ) ; done
+		( cd wrappers/numpy && PATH=$(TOP):$(PATH) $$p ./setup_mpi.py install --prefix=$(TOP)/debian/tmp ) ; done
 	# for p in $(PY3VERS); do \
 #		v=`echo $$p | cut -c7,9` ;\
 #		mv wrappers/numpy/build_$${p}/adios.so wrappers/numpy/build_$${p}/adios.cpython-$${v}m-${DEB_HOST_MULTARCH}.so ;\
diff --git a/wrappers/numpy/conf/__init__.pyc b/wrappers/numpy/conf/__init__.pyc
index 62bdbd6..6d5cb28 100644
Binary files a/wrappers/numpy/conf/__init__.pyc and b/wrappers/numpy/conf/__init__.pyc differ
diff --git a/wrappers/numpy/conf/mpiregexes.pyc b/wrappers/numpy/conf/mpiregexes.pyc
index c20947f..d486f2e 100644
Binary files a/wrappers/numpy/conf/mpiregexes.pyc and b/wrappers/numpy/conf/mpiregexes.pyc differ
diff --git a/wrappers/numpy/conf/mpiscanner.pyc b/wrappers/numpy/conf/mpiscanner.pyc
index 722d1c7..169c325 100644
Binary files a/wrappers/numpy/conf/mpiscanner.pyc and b/wrappers/numpy/conf/mpiscanner.pyc differ

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