From 96378d98dcd8beabeac05b123071def81a7959e0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 2 Jul 2023 21:07:55 +0200 Subject: [PATCH] netdata: update to 1.40.1. --- srcpkgs/netdata/patches/cpp17.patch | 11 +++++++++++ srcpkgs/netdata/template | 13 +++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/netdata/patches/cpp17.patch diff --git a/srcpkgs/netdata/patches/cpp17.patch b/srcpkgs/netdata/patches/cpp17.patch new file mode 100644 index 00000000000..b197ccd57bd --- /dev/null +++ b/srcpkgs/netdata/patches/cpp17.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2023-06-27 16:25:03.364605041 +0200 ++++ - 2023-07-02 21:27:31.113408278 +0200 +@@ -237,7 +237,7 @@ + # C++ version check + + # Check for C++17 support (optional) +-# AX_CXX_COMPILE_STDCXX(17, noext, optional) ++AX_CXX_COMPILE_STDCXX(17, noext, optional) + + if test "x$HAVE_CXX17" != "x1"; then + # Check for C++11 support (optional) diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template index 781120b3f27..176bcf26d8c 100644 --- a/srcpkgs/netdata/template +++ b/srcpkgs/netdata/template @@ -1,14 +1,14 @@ # Template file for 'netdata' pkgname=netdata -version=1.37.1 -revision=2 +version=1.40.1 +revision=1 build_style=gnu-configure build_helper=qemu configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no $(vopt_if cloud --enable-cloud --disable-cloud) $(vopt_if ipmi --enable-plugin-freeipmi) $(vopt_if xen --enable-plugin-xenstat) $(vopt_if cups --enable-plugin-cups)" hostmakedepends="pkg-config autoconf automake $(vopt_if cloud "protobuf protobuf-devel")" -makedepends="json-c-devel libcap-devel liblz4-devel libmnl-devel +makedepends="json-c-devel libcap-devel liblz4-devel libmnl-devel libyaml-devel libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel snappy-devel $(vopt_if cloud protobuf-devel) $(vopt_if ipmi freeipmi-devel) $(vopt_if xen "xen-devel yajl-devel") $(vopt_if cups cups-devel)" @@ -18,7 +18,7 @@ maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="https://www.netdata.cloud/" distfiles="https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz" -checksum=2caa042d43ca61007a61294a5ececa037d83a1973bd38032233760341eb1706b +checksum=cc86172acd5e6ec05bc0fa86a50d967502a264d8adf7f79293923ccd8febb251 python_version=3 make_dirs=" /var/lib/netdata 0755 _netdata _netdata @@ -43,6 +43,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then fi pre_configure() { + vsed -e 's/#define info(/#define netdata_log_info(/g' -i libnetdata/log/log.h + vsed -e 's/^\([ ]*\)info[ ]*(/\1netdata_log_info(/g' -i $(grep -rl '^[ ]*info *(' ./) + vsed -e 's/^\([ ]*\)else info(/\1else netdata_log_info(/g' -i $(grep -rl '^[ ]*else info(' ./) + vsed -e 's/^\([ ]*\)if(\([^)]*\))[ ]*info(/\1if(\2) netdata_log_info(/g' -i $(grep -rl '^[ ]*if([^)]*)[ ]*info(' ./) + if [ "$CROSS_BUILD" ]; then sed -i "s| \$(builddir)/judyltablesgen\$(EXEEXT)| qemu-${XBPS_TARGET_QEMU_MACHINE}-static \$(builddir)/judyltablesgen\$(EXEEXT)|g" Makefile.am fi