mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-01 21:23:51 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/netdata: needs C++

Browse Source 
Buildroot commit 9cfcd906cf bumped the
package from 1.33.1 to 1.37.1. Upstream changed the optional C++ support
into a mandatory dependency with commit
b6d2a3662d
added to version 1.35.0 causing build errors with toolchains without
C++ support:

  GEN      netdatacli
/bin/sh: line 1: no: command not found
make[3]: *** [Makefile:5502: netdatacli] Error 127

Fixes:
https://autobuild.buildroot.org/results/7084a73d5727a86ca55eda3d1f01ea4d5b8ecf65/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Reviewed-by: Michael Cullen <michael@michaelcullen.name>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls
2026-01-25 11:45:01 +01:00
committed by Peter Korsgaard
parent 5d76026af7
commit 33c09c71d5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/netdata/Config.in
View File

@@ -1,6 +1,7 @@
config BR2_PACKAGE_NETDATA config BR2_PACKAGE_NETDATA
bool "netdata" bool "netdata"
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS # libuv depends on !BR2_STATIC_LIBS # libuv
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
@@ -22,22 +23,21 @@ if BR2_PACKAGE_NETDATA
config BR2_PACKAGE_NETDATA_PROMETHEUS config BR2_PACKAGE_NETDATA_PROMETHEUS
bool "prometheus remote write backend" bool "prometheus remote write backend"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
depends on BR2_INSTALL_LIBSTDCPP # protobuf, snappy
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf
select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_PROTOBUF
select BR2_PACKAGE_SNAPPY select BR2_PACKAGE_SNAPPY
help help
Enable prometheus remote write backend Enable prometheus remote write backend
comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 8" comment "prometheus remote write backend needs a toolchain w/ gcc >= 8"
depends on !BR2_INSTALL_LIBSTDCPP || \ depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8
!BR2_TOOLCHAIN_GCC_AT_LEAST_8
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
endif endif
comment "netdata needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" comment "netdata needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 4.9"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_INSTALL_LIBSTDCPP \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4

1
support/testing/tests/package/test_netdata.py
View File

@@ -6,6 +6,7 @@ import infra.basetest
class TestNetdata(infra.basetest.BRTest): class TestNetdata(infra.basetest.BRTest):
config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
""" """
BR2_INSTALL_LIBSTDCPP=y
BR2_PACKAGE_NETDATA=y BR2_PACKAGE_NETDATA=y
BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO=y
# BR2_TARGET_ROOTFS_TAR is not set # BR2_TARGET_ROOTFS_TAR is not set