r45637 - in /packages/getdp/trunk/debian: changelog rules

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Mar 11 12:56:28 2013
New Revision: 45637

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45637
Log:
closes #687317

Modified:
    packages/getdp/trunk/debian/changelog
    packages/getdp/trunk/debian/rules

Modified: packages/getdp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/changelog?rev=45637&op=diff
==============================================================================
--- packages/getdp/trunk/debian/changelog (original)
+++ packages/getdp/trunk/debian/changelog Mon Mar 11 12:56:28 2013
@@ -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
 

Modified: packages/getdp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/rules?rev=45637&op=diff
==============================================================================
--- packages/getdp/trunk/debian/rules (original)
+++ packages/getdp/trunk/debian/rules Mon Mar 11 12:56:28 2013
@@ -5,8 +5,19 @@
 
 # PETSC_DIR is the location of PETSc.
 export PETSC_DIR=/usr/lib/petscdir/3.2
+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
-export SLEPC_DIR=/usr/lib/slepcdir/3.2
+endif
 
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel