rules: Fix the arch selection for enabling the gRPC plugin.

By accident, we disabled it for exactly the wrong archs.

Thanks to Adrian Bunk for reporting this!
Closes: #892166

diff --git a/debian/changelog b/debian/changelog
index 959d28b494bc01996f654c762eff0bb4d079d728..ebdadd0986b6f65540fe1f48d5bc5111d37df61b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+collectd (5.8.0-4) unstable; urgency=medium
+
+  * debian/rules:
+    - Fix the arch selection for enabling the gRPC plugin. By accident, we
+      disabled it for exactly the wrong archs. Thanks to Adrian Bunk for
+      reporting this! (Closes: #892166)
+
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 06 Mar 2018 22:19:38 +0100
+

 collectd (5.8.0-3) unstable; urgency=medium
 
   * debian/control:
 collectd (5.8.0-3) unstable; urgency=medium
 
   * debian/control:

diff --git a/debian/rules b/debian/rules
index 166f4c86dc0b2361d9ec7cca0d94227dc8e99a9d..80f1bc9829f66f57eec4d1d32aa67e1ddc2ad561 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -183,7 +183,8 @@ ifneq (,$(filter hppa sparc, $(DEB_BUILD_ARCH)))
        confflags += --disable-java
 endif
 
        confflags += --disable-java
 endif
 

-ifneq (,$(filter amd64 arm64 armel armhf i386 ppc64el powerpc, $(DEB_BUILD_ARCH)))
+# gRPC is only available on x86, arm, ppc.
+ifeq (,$(filter amd64 arm64 armel armhf i386 ppc64el powerpc, $(DEB_BUILD_ARCH)))

        confflags += --disable-grpc
 endif
 
        confflags += --disable-grpc
 endif