[adios] 130/207: Add PYTHON_MPI4PY_INCLUDE_DIR to CMakeCache.txt

[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 308d1b7893fb46565e1da8c5ab1aca1c5260fd32
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 22 07:02:24 2014 +0100

    Add PYTHON_MPI4PY_INCLUDE_DIR to CMakeCache.txt
---
 debian/changelog |  8 ++++++++
 debian/rules     | 40 +++++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8aa4959..ee0ae16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+adios (1.6.0-6) UNRELEASED; urgency=medium
+
+  * Don't depend on infiniband on hurd, kfreebsd-* 
+  * Prime CMakeCache.txt with PYTHON_MPI4PY_INCLUDE_DIR so it is found
+    on all archs to fix FTBFS. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 22 May 2014 07:02:04 +0100
+
 adios (1.6.0-4) unstable; urgency=medium
 
   * Add python-adios, python3-adios wrapper packages.
diff --git a/debian/rules b/debian/rules
index 08e96fa..8696ad2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,23 +74,25 @@ override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) $(WITH_IBVERBS) --enable-shared \
 		--with-hdf5=/usr --with-bzip2=/usr  --with-zlib=/usr --prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS='-fPIC'
 	# Prep python wrapper. Cache these for cmake otherwise it will get 2.7, 3.* confused
-	mkdir -p wrappers/numpy/build_$(PY2)
-	echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build_$(PY2)/CMakeCache.txt
-	echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/$(PY2)" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
-	echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/$(PY2)" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
-	echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$(PY2).so" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
-	echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
-	echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
-	echo "wrappers/numpy/build_$(PY2)/adios.so	/usr/lib/$(PY2)/dist-packages" > debian/python-adios.install
+	mkdir -p wrappers/numpy/build_${PY2}
+	echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build_${PY2}/CMakeCache.txt
+	echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/${PY2}" >> wrappers/numpy/build_${PY2}/CMakeCache.txt
+	echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/${DEB_HOST_MULTIARCH}/${PY2}" >> wrappers/numpy/build_${PY2}/CMakeCache.txt
+	echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/${DEB_HOST_MULTIARCH}/lib${PY2}.so" >> wrappers/numpy/build_${PY2}/CMakeCache.txt
+	echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/${CXX}" >> wrappers/numpy/build_${PY2}/CMakeCache.txt
+	echo "PYTHON_MPI4PY_INCLUDE_DIR=/usr/lib/${PY2}/dist-packages/mpi4py/include/mpi4py" >> wrappers/numpy/build_$${p}/CMakeCache.txt ;\
+	echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_${PY2}/CMakeCache.txt
+	echo "wrappers/numpy/build_${PY2}/adios.so	/usr/lib/${PY2}/dist-packages" > debian/python-adios.install
 	# And repeat for python3*
-	for p in $(PY3VERS) ; do \
-	mkdir -p wrappers/numpy/build_$$p ; \
-		echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
-		echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/$$(p)" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
-		echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/$$(p)" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
-		echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$(p)m.so" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
-		echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
-		echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
+	for p in ${PY3VERS} ; do \
+	mkdir -p wrappers/numpy/build_$${p} ; \
+		echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build_$${p}/CMakeCache.txt ;\
+		echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/$${p}" >> wrappers/numpy/build_$${p}/CMakeCache.txt ;\
+		echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/${DEB_HOST_MULTIARCH}/$${p}" >> wrappers/numpy/build_$${p}/CMakeCache.txt ;\
+		echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/${DEB_HOST_MULTIARCH}/lib$${p}m.so" >> wrappers/numpy/build_$${p}/CMakeCache.txt ;\
+		echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/${CXX}" >> wrappers/numpy/build_$${p}/CMakeCache.txt ;\
+		echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$${p}/CMakeCache.txt ;\
+		echo "PYTHON_MPI4PY_INCLUDE_DIR=/usr/lib/python3/dist-packages/mpi4py/include/mpi4py" >> wrappers/numpy/build_$${p}/CMakeCache.txt ;\
 		echo "wrappers/numpy/build_$$p/*.so	/usr/lib/python3/dist-packages" >> debian/python3-adios.install ; \
 	done
 		
@@ -101,11 +103,11 @@ override_dh_auto_build:
 	# Need to hack the libs into the right place, to match adios_configs view
 	mv debian/tmp/lib/*/*.a debian/tmp/lib
 	# Now build Python wrapper. Uses adios_config and the debian/tmp install.
-	for p in $(PY2) $(PY3VERS) ; do \
-		( cd wrappers/numpy/build_$$p && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 ) ; done
+	for p in ${PY2} ${PY3VERS} ; do \
+		( cd wrappers/numpy/build_$${p} && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 ) ; 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-$$vm-$(DEB_HOST_MULTARCH).so ;\
+		mv wrappers/numpy/build_$${p}/adios.so wrappers/numpy/build_$${p}/adios.cpython-$${v}m-${DEB_HOST_MULTARCH}.so ;\
 	done
 	# Clean up.
 	rm -r debian/tmp/*

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