From 26f2941babb2d533e9d4ea39087883004dfcb51b Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Thu, 1 Mar 2018 15:37:51 +0100 Subject: [PATCH] disable grpc plugin on platforms lacking build dependencies --- debian/changelog | 7 +++++++ debian/control | 4 ++-- debian/rules | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 322768b..ec87d68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +collectd (5.8.0-3) UNRELEASED; urgency=medium + + * debian/control: Limit libgrpc++-dev and protobuf-compiler-grpc + Build-depend to supported platforms. + + -- Marc Fournier Thu, 01 Mar 2018 15:23:51 +0100 + collectd (5.8.0-2) unstable; urgency=medium * debian/control: Limit intel-cmt-cat Build-depend to intel architectures; diff --git a/debian/control b/debian/control index 4873a57..b1f2894 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh libgeom-dev [kfreebsd-any], libgcrypt20-dev, libglib2.0-dev, - libgrpc++-dev, + libgrpc++-dev [amd64 arm64 armel armhf i386 ppc64el powerpc], libgps-dev, libhiredis-dev, libi2c-dev (>= 4.0~), @@ -65,7 +65,7 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64], protobuf-c-compiler, protobuf-compiler (>= 3.0.0), - protobuf-compiler-grpc, + protobuf-compiler-grpc [amd64 arm64 armel armhf i386 ppc64el powerpc], python-dev, riemann-c-client Build-Conflicts: libpthread-dev, libhal-dev diff --git a/debian/rules b/debian/rules index 9562595..166f4c8 100755 --- a/debian/rules +++ b/debian/rules @@ -183,6 +183,10 @@ ifneq (,$(filter hppa sparc, $(DEB_BUILD_ARCH))) confflags += --disable-java endif +ifneq (,$(filter amd64 arm64 armel armhf i386 ppc64el powerpc, $(DEB_BUILD_ARCH))) + confflags += --disable-grpc +endif + build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp -- 2.30.2