From 05cf1b156fb701e73272f958c088995d5e1e8163 Mon Sep 17 00:00:00 2001 From: Ivan Sokolov Date: Sat, 7 Nov 2020 18:12:18 +0300 Subject: [PATCH 1/2] collectd: add prometheus build option --- srcpkgs/collectd/template | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) mode change 100644 => 100755 srcpkgs/collectd/template diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template old mode 100644 new mode 100755 index f0ff336a74d..00c2c953e55 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,18 +1,22 @@ # Template file for 'collectd' pkgname=collectd version=5.11.0 -revision=4 +revision=5 build_style=gnu-configure -configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) - $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt - --sysconfdir=/etc --disable-static --with-fp-layout=nothing - --with-python=/bin/python3 --disable-werror" +configure_args="--disable-static --disable-werror --enable-virt + --sysconfdir=/etc --with-fp-layout=nothing --with-libiptc --with-libpython + $(vopt_enable notify notify_desktop) + $(vopt_enable perl) + $(vopt_enable rrdtool) + $(vopt_enable prometheus write_prometheus)" conf_files="/etc/collectd.conf" -hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel" -makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel - libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel - libgcrypt-devel libmysqlclient-devel libltdl-devel libvirt-devel - $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)" +hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel $(vopt_if prometheus protobuf-c)" +makedepends="iptables-devel libcurl-devel libesmtp-devel libgcrypt-devel + libltdl-devel libmysqlclient-devel libressl-devel libsensors-devel + libvirt-devel libxml2-devel net-snmp-devel python3-devel yajl-devel zlib-devel + $(vopt_if notify libnotify-devel) + $(vopt_if rrdtool rrdtool-devel) + $(vopt_if prometheus "libmicrohttpd-devel protobuf-c-devel")" short_desc="Daemon which collects system performance statistics periodically" maintainer="Steve Prybylski " license="GPL-2.0-only, MIT" @@ -21,8 +25,9 @@ distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2" checksum=37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2 LDFLAGS="-lgcrypt" -build_options="rrdtool perl notify" +build_options="rrdtool perl notify prometheus" desc_option_rrdtool="Enable support for RRDTool" +desc_option_prometheus="Enable support for Write Prometheus plugin" if [ -z "$CROSS_BUILD" ]; then build_options_default="rrdtool perl" From 23d36b2d7f5bd06818dbe705ffe8c20b924e28ae Mon Sep 17 00:00:00 2001 From: Ivan Sokolov Date: Sat, 7 Nov 2020 18:19:53 +0300 Subject: [PATCH 2/2] WIP: collectd: enable prometheus --- srcpkgs/collectd/template | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 00c2c953e55..71c767ecd8b 100755 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -26,13 +26,10 @@ checksum=37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2 LDFLAGS="-lgcrypt" build_options="rrdtool perl notify prometheus" +build_options_default="prometheus" desc_option_rrdtool="Enable support for RRDTool" desc_option_prometheus="Enable support for Write Prometheus plugin" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="rrdtool perl" -fi - pre_configure() { autoreconf -fi }