From 14d09c6db92152052024e061eff933c3353be031 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Nov 2020 07:36:37 +0100 Subject: [PATCH] package/collectd: fix grpc dependency Commit e98610f039b88a5d164b19343d5ecef2d1c01f6d forgot to propagate libabseil-cpp dependencies to BR2_PACKAGE_COLLECTD_GRPC Fixes: - http://autobuild.buildroot.org/results/c9bacfb52ae46ab78a5f9097a8df83e10d23ccc4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 7037a8b383..3e854ba518 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -605,15 +605,17 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # grpc -> protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # grpc -> libabseil-cpp + depends on BR2_HOST_GCC_AT_LEAST_4_9 # grpc -> host-libabseil-cpp depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help Send/receive values using the gRPC protocol. -comment "grpc needs a toolchain w/ C++, gcc >= 4.8" +comment "grpc needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc -- 2.30.2