r53947 - in /desktop/unstable/gnome-software/debian: changelog control control.in rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Fri Sep 15 12:17:54 2017
New Revision: 53947

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53947
Log:
Only build with valgrind on architectures where valgrind is available

Modified:
    desktop/unstable/gnome-software/debian/changelog
    desktop/unstable/gnome-software/debian/control
    desktop/unstable/gnome-software/debian/control.in
    desktop/unstable/gnome-software/debian/rules

Modified: desktop/unstable/gnome-software/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/changelog?rev=53947&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/changelog	[utf-8] Fri Sep 15 12:17:54 2017
@@ -1,3 +1,9 @@
+gnome-software (3.26.0-2) UNRELEASED; urgency=medium
+
+  * Only build with valgrind on architectures where valgrind is available
+
+ -- Jeremy Bicha <jbicha at debian.org>  Fri, 15 Sep 2017 08:14:47 -0400
+
 gnome-software (3.26.0-1) unstable; urgency=medium
 
   [ Jeremy Bicha ]

Modified: desktop/unstable/gnome-software/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/control?rev=53947&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/control	[utf-8] Fri Sep 15 12:17:54 2017
@@ -34,7 +34,7 @@
                libxml2-utils,
                meson (>= 0.37),
                pkg-config,
-               valgrind,
+               valgrind [amd64 arm64 armhf i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el s390x],
                xsltproc
 Standards-Version: 3.9.8
 Homepage: https://wiki.gnome.org/Apps/Software

Modified: desktop/unstable/gnome-software/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/control.in?rev=53947&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/control.in	[utf-8] Fri Sep 15 12:17:54 2017
@@ -30,7 +30,7 @@
                libxml2-utils,
                meson (>= 0.37),
                pkg-config,
-               valgrind,
+               valgrind [amd64 arm64 armhf i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el s390x],
                xsltproc
 Standards-Version: 3.9.8
 Homepage: https://wiki.gnome.org/Apps/Software

Modified: desktop/unstable/gnome-software/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/rules?rev=53947&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/rules	[utf-8] Fri Sep 15 12:17:54 2017
@@ -14,7 +14,8 @@
 	-Denable-fwupd=false \
 	-Denable-flatpak=false \
 	-Denable-limba=false \
-	-Denable-ubuntu-reviews=true
+	-Denable-ubuntu-reviews=true \
+	-Denable-valgrind=false
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	# Enable Flatpak and Limba support on Linux
@@ -23,6 +24,11 @@
 	# Enable fwupd support on supported architectures
 	ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armhf i386))
 		GS_CONFIGURE_FLAGS += -Denable-fwupd=true
+	endif
+
+	# Enable valgrind support on supported architectures
+	ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el s390x))
+		GS_CONFIGURE_FLAGS += -Denable-valgrind=true
 	endif
 endif