[getdp] 36/60: closes #687317

[Matteo F. Vescovi]

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

mfv pushed a commit to branch master
in repository getdp.

commit 021d011b8a62cd91f01cc8dfb17039c3bd7cb91f
Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
Date:   Mon Mar 11 12:56:28 2013 +0000

    closes #687317
---
 debian/changelog |  4 ++++
 debian/rules     | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 17dffc2..5ad6f33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 getdp (2.3.0-1) unstable; urgency=low
 
   * New upstream release
+  
+  [Konstantinos Margaritis]
+  * debian/rules: 
+       set PETSC_ARCH according to DEB_HOST_ARCH (Closes: #687317)
 
  -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Mon, 11 Mar 2013 13:43:49 +0100
 
diff --git a/debian/rules b/debian/rules
index 4c405c2..a7a7a95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,20 @@ DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e
 
 # PETSC_DIR is the location of PETSc.
 export PETSC_DIR=/usr/lib/petscdir/3.2
-export PETSC_ARCH=linux-gnu-c-opt
 export SLEPC_DIR=/usr/lib/slepcdir/3.2
 
+# Fix FTBS on armhf
+ifneq ("", findstring("$(DEB_HOST_ARCH)", "armel armhf"))
+ifeq ("armhf", "$(DEB_HOST_ARCH)")
+export PETSC_ARCH=linux-gnueabihf-c-opt
+endif
+ifeq ("armel", "$(DEB_HOST_ARCH)")
+export PETSC_ARCH=linux-gnueabi-c-opt
+endif
+else
+export PETSC_ARCH=linux-gnu-c-opt
+endif
+
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
 export OMPI_MCA_plm_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot

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