Bug#742514: clasp: fix up TBB handling for ppc64el

[Colin Watson]

Package: clasp
Version: 2.1.4-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch trusty

clasp failed to build on Ubuntu's ppc64el architecture (little-endian
ppc64) because the debian/rules check is a bit imprecise: it matches
substrings rather than the full architecture name.  The following patch
fixes that, and also adds ppc64el to the list of architectures where
libtbb-dev is available.

  * Match the whole line in dpkg-architecture -qDEB_BUILD_ARCH check, to
    avoid getting confused by substrings.
  * Use TBB on ppc64el.

diff -Nru clasp-2.1.4/debian/control clasp-2.1.4/debian/control
--- clasp-2.1.4/debian/control	2013-05-21 08:25:28.000000000 +0100
+++ clasp-2.1.4/debian/control	2014-03-24 16:30:04.000000000 +0000
@@ -5,7 +5,7 @@
 Uploaders: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
 Build-Depends: debhelper (>= 9),
  dpkg-dev (>= 1.16.1~),
- libtbb-dev (>= 4.0+r233) [amd64 ia64 ppc64]
+ libtbb-dev (>= 4.0+r233) [amd64 ia64 ppc64 ppc64el]
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/debian-science/packages/clasp.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/clasp.git
diff -Nru clasp-2.1.4/debian/rules clasp-2.1.4/debian/rules
--- clasp-2.1.4/debian/rules	2012-08-27 22:05:23.000000000 +0100
+++ clasp-2.1.4/debian/rules	2014-03-24 16:33:46.000000000 +0000
@@ -12,7 +12,7 @@
 # or compatible hardware, this package only supports Pentium4-compatible
 # and higher processors.
 #
-arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep "(amd64|ia64|ppc64)")
+arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep -x "(amd64|ia64|ppc64|ppc64el)")
 os = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS | grep linux)
 
 # use hardening config flags for compiling clasp

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]