[adios] 119/207: Fix python2 build

[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 2c85005f1bdc7f33cf705843881255e82ac06852
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 19 15:38:46 2014 +0100

    Fix python2 build
---
 debian/python-adios.install |  1 -
 debian/rules                | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/python-adios.install b/debian/python-adios.install
deleted file mode 100644
index 227a641..0000000
--- a/debian/python-adios.install
+++ /dev/null
@@ -1 +0,0 @@
-wrappers/numpy/build2/adios.so	/usr/lib/python2.7/dist-packages/adios
diff --git a/debian/rules b/debian/rules
index 1d6afa9..3f06948 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@ DESTDIR:=$(shell pwd)/debian/tmp
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 BINDIR:=$(DESTDIR)/usr/bin
+PY2:=python2.7 # Just in case ...
 PY3VERS:= $(shell py3versions -s)
 
 TOP:=$(shell pwd)
@@ -56,20 +57,21 @@ TOP:=$(shell pwd)
 override_dh_auto_clean:
 	dh_clean
 	find . -name '*.pyc' -delete
-	rm -fr wrappers/numpy/build wrappers/java/build
+	rm -fr wrappers/numpy/build_* wrappers/java/build
 	rm -f debian/python3-adios.install
 
 override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) --enable-shared \
 		--with-hdf5=/usr --with-bzip2=/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/build2
-	echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build2CMakeCache.txt
-	echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7" >> wrappers/numpy/build2/CMakeCache.txt
-	echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/python2.7" >> wrappers/numpy/build2/CMakeCache.txt
-	echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython2.7.so" >> wrappers/numpy/build2/CMakeCache.txt
-	echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build2/CMakeCache.txt
-	echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build2/CMakeCache.txt
+	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/python2.7" >> 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/builds_$PY2/adios.so	/usr/lib/$(PY2)/dist-packages/adios
 	# And repeat for python3*
 	for p in $(PY3VERS) ; do \
 	mkdir -p wrappers/numpy/build_$$p ; \
@@ -89,7 +91,7 @@ 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 $(PY3VERS) ; do \
+	for p in $PY2 $(PY3VERS) ; do \
 		( cd wrappers/numpy/build_$$p && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 ) ; 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