aboutsummaryrefslogtreecommitdiff
path: root/package/collectd
diff options
context:
space:
mode:
authorGravatar Romain Naour <romain.naour@gmail.com>2017-05-07 15:32:46 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-05-07 15:51:00 +0200
commit744fa220bf7314729abb2778a23aa1d52aa28476 (patch)
treebfa958f963b9fe7e420d2d718f8289afd65ddbc4 /package/collectd
parent362d185b309a1634901d4cb35bc1778d58e2015a (diff)
downloadbuildroot-744fa220bf7314729abb2778a23aa1d52aa28476.tar.gz
buildroot-744fa220bf7314729abb2778a23aa1d52aa28476.tar.bz2
package/protobuf: needs gcc >= 4.5
Even with an upstream patch from protobuf v3.3 [1], the build fail with another issue: In file included from google/protobuf/dynamic_message.cc:80: ./google/protobuf/map_field.h: In member function 'void google::protobuf::internal::MapField<Key, T, key_wire_type, value_wire_type, default_enum_value>::Swap(google::protobuf::internal::MapFieldLite<Key, T, kKeyFieldType, kValueFieldType, default_enum_value>*)': ./google/protobuf/map_field.h:139: error: object missing in reference to 'google::protobuf::internal::MapFieldBase::repeated_field_' ./google/protobuf/map_field_inl.h:342: error: from this location ./google/protobuf/map_field.h:150: error: object missing in reference to 'google::protobuf::internal::MapFieldBase::state_' ./google/protobuf/map_field_inl.h:344: error: from this location Add a dependency on gcc >= 4.5. [1] https://github.com/google/protobuf/commit/a83ac8663fb8042a881bc60b12a8bd3a0c03a3ff Fixes: http://autobuild.buildroot.org/results/77d/77dbb6bbbc0ea9e9bcdd22b10011ef9728c20d54 http://autobuild.buildroot.org/results/21f/21f5e1ea4f37e1d174604d6da78c0e916c89f1e3 http://autobuild.buildroot.org/results/24e/24e880086c87d40b5d79a90d805acc75b33d484c Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Mario J. Rugiero <mrugiero@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/collectd')
-rw-r--r--package/collectd/Config.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 47bfe95d98..d270494a07 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -548,9 +548,10 @@ comment "rrdtool support needs a toolchain w/ wchar"
config BR2_PACKAGE_COLLECTD_RIEMANN
bool "riemann"
- depends on BR2_INSTALL_LIBSTDCPP # protobuf
- # protobuf-c -> host-protobuf
+ # riemann-c-client -> protobuf-c
+ depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+ depends on BR2_HOST_GCC_AT_LEAST_4_5
select BR2_PACKAGE_RIEMANN_C_CLIENT
select BR2_PACKAGE_LIBTOOL
help
@@ -577,14 +578,15 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS
bool "write_prometheus"
depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c
+ depends on BR2_HOST_GCC_AT_LEAST_4_5 # protobuf-c
select BR2_PACKAGE_LIBMICROHTTPD
select BR2_PACKAGE_PROTOBUF_C
help
Publishes values using an embedded HTTP server, in a format
compatible with Prometheus' collectd_exporter.
-comment "write_prometheus needs a toolchain w/ C++"
- depends on !BR2_INSTALL_LIBSTDCPP
+comment "write_prometheus needs a toolchain w/ C++, host gcc >= 4.5"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_5
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
config BR2_PACKAGE_COLLECTD_WRITESENSU