Attachment 188133 Details for Bug 223760 – patch to add java option and disable perl when disabled

[patch] patch to add java option and disable perl when disabled

collectd5_java.diff (text/plain), 2.14 KB, created by Steve Wills on 2017-11-20 02:03:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2017-11-20 02:03:42 UTC

Size: 2.14 KB

patch

obsolete

>Index: net-mgmt/collectd5/Makefile
>===================================================================
>--- net-mgmt/collectd5/Makefile	(revision 454512)
>+++ net-mgmt/collectd5/Makefile	(working copy)
>@@ -18,7 +18,7 @@
> USES=		autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
> GNU_CONFIGURE=	yes
> 
>-OPTIONS_DEFINE=		CGI DEBUG GCRYPT LOGSTASH VIRT
>+OPTIONS_DEFINE=		CGI JAVA LOGGING GCRYPT LOGSTASH VIRT
> OPTIONS_GROUP=		INPUT OUTPUT
> OPTIONS_GROUP_OUTPUT=	KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL \
> 			TSDB
>@@ -90,11 +90,9 @@
> 		--disable-ceph \
> 		--disable-cgroups \
> 		--disable-fhcount \
>-		--without-java \
> 		--without-libaquaero5 \
> 		--without-libganglia \
> 		--without-libiptc \
>-		--without-libjvm \
> 		--without-liblvm2app \
> 		--without-libkstat \
> 		--without-libldap \
>@@ -127,8 +125,12 @@
> CURL_XML_IMPLIES=		CURL XML
> CURL_XML_CONFIGURE_ENABLE=	ascent bind curl_xml
> 
>-DEBUG_CONFIGURE_ENABLE=		debug
>+JAVA_USE=			java
>+JAVA_CONFIGURE_ENABLE=		java
>+JAVA_CONFIGURE_WITH=		java=${LOCALBASE} libjvm
> 
>+LOGGING_CONFIGURE_ENABLE=		debug
>+
> DBI_LIB_DEPENDS=		libdbi.so:databases/libdbi
> DBI_CONFIGURE_WITH=		libdbi=${LOCALBASE}
> DBI_CONFIGURE_ENABLE=		dbi
>@@ -199,7 +201,8 @@
> 
> PERL_USES=			perl5
> PERL_CONFIGURE_ENABLE=		perl
>-PERL_CONFIGURE_WITH=		perl=${PERL} perl-bindings
>+PERL_CONFIGURE_DISABLE=		perl
>+PERL_CONFIGURE_WITH=		perl=${PERL} perl-bindings libperl
> 
> PGSQL_USES=			pgsql
> PGSQL_CONFIGURE_ENABLE=		postgresql
>Index: net-mgmt/collectd5/pkg-plist
>===================================================================
>--- net-mgmt/collectd5/pkg-plist	(revision 454512)
>+++ net-mgmt/collectd5/pkg-plist	(working copy)
>@@ -34,6 +34,7 @@
> lib/collectd/filecount.so
> lib/collectd/interface.so
> %%IPMI%%lib/collectd/ipmi.so
>+%%JAVA%%lib/collectd/java.so
> lib/collectd/load.so
> %%LOGSTASH%%lib/collectd/log_logstash.so
> lib/collectd/logfile.so
>@@ -105,6 +106,8 @@
> %%TSDB%%lib/collectd/write_tsdb.so
> %%XMMS%%lib/collectd/xmms.so
> lib/collectd/zfs_arc.so
>+%%JAVA%%%%DATADIR%%/java/collectd-api.jar
>+%%JAVA%%%%DATADIR%%/java/generic-jmx.jar
> %%ZOOKEEPER%%lib/collectd/zookeeper.so
> libdata/pkgconfig/libcollectdclient.pc
> %%DATADIR%%/postgresql_default.conf

Actions: View | Diff

Attachments on bug 223760: 188133