pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Fix protobuf/protobuf-c dependencies in collectd-{riemann,write_prometheus}



Module Name:	pkgsrc-wip
Committed By:	Edgar Fuß <ef%math.uni-bonn.de@localhost>
Pushed By:	ef
Date:		Tue Aug 18 10:53:34 2020 +0200
Changeset:	a6a971f25a9a7912315777c59db49b4bc0cf5c84

Modified Files:
	collectd-riemann/Makefile
	collectd-write_prometheus/Makefile

Log Message:
Fix protobuf/protobuf-c dependencies in collectd-{riemann,write_prometheus}

Missed COLLECTD_LIBS.protobuf-c and BUILD_DEPENDS on protobug in collectd-write_prometheus.
collectd-riemann seems to at least build-depend on protobuf-c (mising check in upstream configure). It is yet unclear whether it needs protobuf-c libs.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a6a971f25a9a7912315777c59db49b4bc0cf5c84

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 collectd-riemann/Makefile          | 3 +++
 collectd-write_prometheus/Makefile | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diffs:
diff --git a/collectd-riemann/Makefile b/collectd-riemann/Makefile
index 9438d02a75..11c3b122c2 100644
--- a/collectd-riemann/Makefile
+++ b/collectd-riemann/Makefile
@@ -8,8 +8,11 @@ PKGREVISION=		7
 
 #.include "../../devel/protobuf-c/buildlink3.mk"
 .include "../../sysutils/riemann-client/buildlink3.mk"
+#COLLECTD_LIB.protobuf-c=${BUILDLINK_PREFIX.protobuf-c}
 COLLECTD_LIB.riemann-client=${BUILDLINK_PREFIX.riemann-client}
 
+BUILD_DEPENDS+=		protobuf-c-[0-9]*:../../devel/protobuf-c
+
 .include "../../wip/collectd/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/collectd-write_prometheus/Makefile b/collectd-write_prometheus/Makefile
index fb5bda1bab..d37672e3e6 100644
--- a/collectd-write_prometheus/Makefile
+++ b/collectd-write_prometheus/Makefile
@@ -5,10 +5,13 @@ COLLECTD_PACKAGE=	write_prometheus
 COMMENT=		Statistics collection daemon - write_prometheus plugin
 PKGREVISION=		7
 
-#.include "../../devel/protobuf-c/buildlink3.mk"
+.include "../../devel/protobuf-c/buildlink3.mk"
+COLLECTD_LIB.protobuf-c=${BUILDLINK_PREFIX.protobuf-c}
 .include "../../www/libmicrohttpd/buildlink3.mk"
 COLLECTD_LIB.microhttpd=${BUILDLINK_PREFIX.libmicrohttpd}
 
+BUILD_DEPENDS+=	protobuf-[0-9]*:../../devel/protobuf
+
 .include "../../wip/collectd/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index