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

Proposed by Colin Watson on 2014-03-18
Status: Approved
Approved by: Pete Woods on 2014-03-28
Approved revision: 150
Proposed branch: lp:~cjwatson/libusermetrics/valgrind-optional
Merge into: lp:libusermetrics
Diff against target: 26 lines (+3/-2)
2 files modified
debian/control (+1/-1)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~cjwatson/libusermetrics/valgrind-optional
Reviewer Review Type Date Requested Status
Pete Woods (community) 2014-03-18 Approve on 2014-03-28
PS Jenkins bot (community) continuous-integration Approve on 2014-03-18
Review via email: mp+211563@code.launchpad.net

Commit message

Only require valgrind on architectures where it is available.

Description of the change

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

To post a comment you must log in.
Pete Woods (pete-woods) wrote :

LGTM

review: Approve
Robert Bruce Park (robru) wrote :

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) wrote :

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) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-09-26 12:43:32 +0000
3+++ debian/control 2014-03-18 15:54:42 +0000
4@@ -17,7 +17,7 @@
5 pkg-config,
6 qtbase5-dev,
7 sqlite3,
8- valgrind,
9+ valgrind [amd64 armhf i386 powerpc],
10 qtdeclarative5-dev,
11 qtdeclarative5-qtquick2-plugin,
12 qtdeclarative5-test-plugin,
13
14=== modified file 'debian/rules'
15--- debian/rules 2014-03-03 13:29:06 +0000
16+++ debian/rules 2014-03-18 15:54:42 +0000
17@@ -3,7 +3,8 @@
18
19 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
20
21-ifeq ($(DEB_HOST_ARCH),armhf)
22+export DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
23+ifeq (,$(filter amd64 i386 powerpc,$(DEB_HOST_ARCH)))
24 ENABLE_MEMCHECK_OPTION = OFF
25 else
26 ENABLE_MEMCHECK_OPTION = ON

Subscribers

People subscribed via source and target branches

to all changes: