[adios] 01/02: WIP: redo python3 work

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository adios.

commit a9be1449d4b25e5b40ddd9ce0731556dc58396a1
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Aug 17 06:51:53 2015 +0100

    WIP: redo python3 work
---
 debian/rules | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 902c3d4..c106fd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,10 +45,12 @@ export PATH:=$(TOP):$(PATH)
 
 override_dh_auto_clean:
 	dh_clean
-	find . -name '*.pyc' -delete
+	find . -name '*.pyc' -o -name '*.o' -o -name '*.a' -name '*.mod' -delete
 	rm -fr wrappers/numpy/build wrappers/java/build debian/tmpp
 	# Remove dodgy symlink
-	rm -f ./examples/staging/stage_write/writer_adios config.log
+	rm -f ./examples/staging/stage_write/writer_adios config.log 
+	rm -f libtool config.h  config.status adios_config.flags  adios_config
+	rm -r adios.pc stamp-h1
 
 override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) $(WITH_IBVERBS) --enable-shared \
@@ -58,7 +60,7 @@ override_dh_auto_configure:
 		--with-phdf5-libdir=$(LIBDIR)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr \
 		--prefix=/usr MPIFC=mpif77 CFLAGS='$(CFLAGS) -I$(LIBDIR)/glib-2.0/include' \
-LIBS=' -lpthread'
+		LIBS=' -lpthread' CYTHON=y CYTHON3=y 
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.
@@ -68,10 +70,11 @@ override_dh_auto_build:
 	mv debian/tmp/usr/lib/*/*.a debian/tmp/usr/lib
 	# Now build Python wrapper. Uses adios_config and the debian/tmp install.
 	chmod +x adios_config
-	for p in ${PY2VERS} ${PY3VERS} ; do \
-		( cd wrappers/numpy && \
-		    $$p ./setup.py     install --prefix=$(TOP)/debian/tmpp  ;\
-			$$p ./setup_mpi.py install --prefix=$(TOP)/debian/tmpp ) ; done
+	( cd wrappers/numpy && \
+		    ${PY2VERS} ./setup.py     install --prefix=$(TOP)/debian/tmpp  ;\
+		    ${PY2VERS} ./setup_mpi.py install --prefix=$(TOP)/debian/tmpp  ;\
+		    ${PY3VERS} ./setup3.py     install --prefix=$(TOP)/debian/tmpp  ;\
+		    ${PY3VERS} ./setup3_mpi.py install --prefix=$(TOP)/debian/tmpp ) 
 	# Clean up.
 	rm -r debian/tmp/*
 	# Now do the static build we want.

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