Merge lp:~cjwatson/libusermetrics/valgrind-optional into lp:libusermetrics

[Colin Watson]

Only require valgrind on architectures where it is available.

This should allow libusermetrics to build on the Ubuntu architectures (arm64 and ppc64el) where valgrind is not currently available.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/libusermetrics-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-trusty-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/libusermetrics-trusty-armhf-ci/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libusermetrics-ci/74/rebuild

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

LGTM

review: Approve

[Robert Bruce Park (robru)]

It seems xnox took the opposite approach, blacklisting arches where valgrind is not available:

http://launchpadlibrarian.net/170310103/libusermetrics_1.1.1%2B14.04.20140305-0ubuntu1_1.1.1%2B14.04.20140305-0ubuntu2.diff.gz

[Colin Watson (cjwatson)]

Either would technically work, but I think in general positive terminology is better when it's a case of something that has to be explicitly ported to each new architecture; it saves on effort when we introduce new architectures.

[Pete Woods (pete-woods)]

The debate doesn't really matter when this is already released / merged. Thankyou for the MR. :)

Unmerged revisions

150. By Colin Watson on 2014-03-18

Only require valgrind on architectures where it is available.

=== modified file 'debian/control'
--- debian/control	2013-09-26 12:43:32 +0000
+++ debian/control	2014-03-18 15:54:42 +0000
@@ -17,7 +17,7 @@
                pkg-config,
                qtbase5-dev,
                sqlite3,
-               valgrind,
+               valgrind [amd64 armhf i386 powerpc],
                qtdeclarative5-dev,
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
 
=== modified file 'debian/rules'
--- debian/rules	2014-03-03 13:29:06 +0000
+++ debian/rules	2014-03-18 15:54:42 +0000
@@ -3,7 +3,8 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
-ifeq ($(DEB_HOST_ARCH),armhf)
+export DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq (,$(filter amd64 i386 powerpc,$(DEB_HOST_ARCH)))
         ENABLE_MEMCHECK_OPTION = OFF
 else
         ENABLE_MEMCHECK_OPTION = ON