[adios] 20/207: Make lustre support conditional

[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 8fe33a3107e6e08b2e79c1ff79f8c1ea056c8aa0
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Aug 15 09:34:41 2011 +0100

    Make lustre support conditional
---
 debian/changelog |  6 ++++++
 debian/control   |  3 ++-
 debian/rules     | 19 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c5f6e0..446a7cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+adios (1.3-3) unstable; urgency=low
+
+  * Make lustre support conditional to intel,amd64, powerpc archs. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 15 Aug 2011 09:34:02 +0100
+
 adios (1.3-2) unstable; urgency=low
 
   * Set CC=mpicc to ensure new C code gets built with MPI. 
diff --git a/debian/control b/debian/control
index 415509b..e98480c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: adios
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libnetcdf-dev, gfortran, libhdf5-mpi-dev | libhdf5-dev, libmxml-dev, python-all-dev, mpi-default-dev, lustre-dev
+Build-Depends: debhelper (>= 7.0.50~), libnetcdf-dev, gfortran, libhdf5-mpi-dev | libhdf5-dev, libmxml-dev, python-all-dev, mpi-default-dev, 
+ lustre-dev [i386 amd64 ia64 powerpc]
 Standards-Version: 3.9.2
 Homepage: http://www.olcf.ornl.gov/center-projects/adios/
 
diff --git a/debian/rules b/debian/rules
index 71f45c7..aa523af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,23 @@
 
 #export DH_VERBOSE=1
 
+
+ARCH:=$(shell dpkg --print-architecture)
+WITH_LUSTRE := 
+
+ifeq ($(ARCH), i386) 
+  WITH_LUSTRE:= --with-lustre
+endif
+ifeq ($(ARCH), amd64)
+  WITH_LUSTRE:= --with-lustre
+endif
+ifeq ($(ARCH), powerpc) 
+  WITH_LUSTRE:= --with-lustre
+endif
+ifeq ($(ARCH), ia64) 
+  WITH_LUSTRE:= --with-lustre
+endif
+
 BINDIR=debian/libadios-dev/usr/bin
 # magic debhelper rule
 %:
@@ -12,7 +29,7 @@ override_dh_auto_clean:
 	find . -name '*.pyc' -delete
 
 override_dh_auto_configure:
-	dh_auto_configure --  --with-lustre --enable-shared --prefix=`pwd`/debian/tmp  MPIFC=mpif77 CC=mpicc
+	dh_auto_configure --  $(WITH_LUSTRE) --enable-shared --prefix=`pwd`/debian/tmp  MPIFC=mpif77 CC=mpicc
 
 override_dh_auto_install:
 	$(MAKE) install prefix=$(shell pwd)/debian/libadios-dev/usr 

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