[silo-llnl] 30/96: Fix for lam_mpi problem

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 152d3ecd1565c909424b6bd14eaa2377107e0520
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Sep 8 22:09:05 2011 +0100

    Fix for lam_mpi problem
---
 debian/changelog |  5 +++--
 debian/rules     | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92ddf41..e1fe37a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 silo-llnl (4.8-6) unstable; urgency=low
 
   * Fixes needed to make autoreconf -fiv work correctly. Closes: #619830. 
-  * B-D autoconf-archive to include AX_CHECK_COMPILE_FLAG needed now. 
+  * B-D autoconf-archive to include AX_CHECK_COMPILE_FLAG needed now.
+  * Build with mpicc.lam when using LAM. Closes: #639119.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Tue, 06 Sep 2011 12:11:02 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 09 Sep 2011 11:11:02 +0100
 
 silo-llnl (4.8-5) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index f2f995a..c2972bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,35 @@
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+# export DH_VERBOSE=1
 
 # magic debhelper rule
 %:
 	dh $@ --with python2 
 
 include /usr/share/mpi-default-dev/debian_defaults
+#ARCH_DEFAULT_MPI_IMPL=lam
 MPI_INC=/usr/lib/$(ARCH_DEFAULT_MPI_IMPL)/include
 
+ifeq ($(ARCH_DEFAULT_MPI_IMPL),lam)
+  CC:=mpicc.lam
+else
+  CC:=mpicc
+endif
+
 PYVERS:= `pyversions -s`
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
 	autoreconf -fiv
-	dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I$(MPI_INC)"
+	dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I$(MPI_INC)"  CC=$(CC) 
 
 override_dh_auto_build:
 	dh_auto_build
 	set -e ; for p in $(PYVERS) ; do   \
-		 dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib PYTHON=$$p CPPFLAGS=" -I$(MPI_INC)" ; \
-		$(MAKE) -C tools/python; \
+		 dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib PYTHON=$$p CPPFLAGS=" -I$(MPI_INC)" CC=$(CC)  ; \
+		$(MAKE) -C tools/browser CXX=$(CC) ; \
+		$(MAKE) -C tools/python ; \
 		mkdir -p  debian/tmp/usr/lib/pyshared/$$p ;  \
 		cp tools/python/.libs/Silo.so debian/Silo.so.$$p  ; \
 	done

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