[adios] 202/207: WIP: Test linking -lpthread

[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 ded54381c71f814be8efd239665c5b44056899fb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat May 9 21:13:07 2015 +0100

    WIP: Test linking -lpthread
---
 debian/rules | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index c3d90a9..de9f430 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,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
+PY2VERS:=python2.7
 PY3VERS:= $(shell py3versions -s)
 
 TOP:=$(shell pwd)
@@ -79,7 +79,8 @@ override_dh_auto_configure:
 		--with-phdf5-incdir=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-phdf5-libdir=$(LIBDIR)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr \
-		--prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS=-I$(LIBDIR)/glib-2.0/include
+		--prefix=$(DESTDIR) MPIFC=mpif77 CFLAGS=-I$(LIBDIR)/glib-2.0/include \
+LIBS=' -lpthread'
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.
@@ -88,7 +89,7 @@ override_dh_auto_build:
 	mv debian/tmp/lib/*/*.a debian/tmp/lib
 	# Now build Python wrapper. Uses adios_config and the debian/tmp install.
 	chmod +x adios_config
-	for p in ${PY2} ${PY3VERS} ; do \
+	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
@@ -103,7 +104,7 @@ override_dh_auto_install:
 	install -D -m 644  adios.pc $(TOP)/debian/tmp/$(LIBDIR)/pkgconfig
 	# Sort python stuff
 	mkdir -p $(TOP)/debian/tmp/usr/lib/python3/dist-packages
-	mkdir -p $(TOP)/debian/tmp/usr/lib/${PY2}/dist-packages
+	mkdir -p $(TOP)/debian/tmp/usr/lib/${PY2VERS}/dist-packages
 	for p in $(PY3VERS); do \
 		v=`echo $$p | cut -c7,9` ;\
 		CYV=cpython-$${v}m ;\
@@ -112,10 +113,10 @@ override_dh_auto_install:
 		mv $(TOP)/debian/tmpp/lib/$${p}/site-packages/adios_mpi.$${CYV}.so \
 			debian/tmp/usr/lib/python3/dist-packages/adios_mpi.$${CYV}-${DEB_HOST_MULTIARCH}.so  ; \
 	done
-	mv $(TOP)/debian/tmpp/lib/${PY2}/site-packages/adios_mpi.so \
-		debian/tmp/usr/lib/${PY2}/dist-packages/adios_mpi.${DEB_HOST_MULTIARCH}.so
-	mv $(TOP)/debian/tmpp/lib/${PY2}/site-packages/adios.so \
-		debian/tmp/usr/lib/${PY2}/dist-packages/adios.${DEB_HOST_MULTIARCH}.so
+	mv $(TOP)/debian/tmpp/lib/${PY2VERS}/site-packages/adios_mpi.so \
+		debian/tmp/usr/lib/${PY2VERS}/dist-packages/adios_mpi.${DEB_HOST_MULTIARCH}.so
+	mv $(TOP)/debian/tmpp/lib/${PY2VERS}/site-packages/adios.so \
+		debian/tmp/usr/lib/${PY2VERS}/dist-packages/adios.${DEB_HOST_MULTIARCH}.so
 	rm -r debian/tmpp
 	# remove due to it not working in multi-arch;
 	rm -f  $(BINDIR)/adios_config.flags

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