summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2014-10-01 19:51:05 +0100
committerSimon McVittie <smcv@debian.org>2014-10-06 14:39:07 +0100
commit7ad6465c1521dd736d798eeef0798d20bee1fcca (patch)
tree45304345d54696e4e338980282a1b45679ec3f6a
parentee73d80d86e0ab2ea09d4043e376b1cadd8311f5 (diff)
downloaddbus-7ad6465c1521dd736d798eeef0798d20bee1fcca.tar.gz
Use --with-valgrind=auto (supported since 1.7.6) for the debug build
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules11
2 files changed, 2 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index 459f6dd6..3f83328f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ dbus (1.8.8-2) UNRELEASED; urgency=medium
(because that's responsible for normal session bus setup)
* Make Build-Profiles field comply with updated spec (patch from
Johannes Schauer, Closes: #764222)
+ * Use --with-valgrind=auto (supported since 1.7.6) for the debug build
-- Simon McVittie <smcv@debian.org> Mon, 22 Sep 2014 11:52:10 +0100
diff --git a/debian/rules b/debian/rules
index 7b04915b..e4002053 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,7 @@ debug_configure_flags := \
--enable-asserts \
--enable-checks \
--enable-verbose-mode \
+ --with-valgrind=auto \
--prefix=/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/debug-build \
--libdir='$${prefix}/lib' \
$(NULL)
@@ -90,16 +91,6 @@ debug_configure_flags += \
$(NULL)
endif
-# libdbus doesn't have --with-valgrind=auto yet. We want to enable it
-# on those architectures where it exists, while only having to modify
-# debian/control when it works on more architectures.
-#
-# We could use --with-valgrind=auto if someone reviewed the patch on
-# <https://bugs.freedesktop.org/show_bug.cgi?id=56925>.
-ifeq (yes,$(shell if pkg-config --exists valgrind; then echo yes; fi))
-debug_configure_flags += --with-valgrind
-endif
-
override_dh_auto_configure:
cp debian/dbus.install-generic debian/dbus.install
if [ -n "$(with_systemd)" ]; then \