commit: fa6b72f161927f3fdb75cfb805fa8bf3c7906432 Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> AuthorDate: Mon Jun 24 13:03:24 2019 +0000 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> CommitDate: Mon Jun 24 13:03:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6b72f1
net-proxy/haproxy: Add prometheus-exporter re bug 688350 Package-Manager: Portage-2.3.67, Repoman-2.3.12 Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> net-proxy/haproxy/haproxy-2.0.0.ebuild | 10 +++++++--- net-proxy/haproxy/metadata.xml | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/net-proxy/haproxy/haproxy-2.0.0.ebuild b/net-proxy/haproxy/haproxy-2.0.0.ebuild index e41593121e8..3924975aade 100644 --- a/net-proxy/haproxy/haproxy-2.0.0.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.0.ebuild @@ -20,8 +20,8 @@ fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit ssl -systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" +IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter +ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) @@ -98,8 +98,12 @@ src_compile() { # For now, until the strict-aliasing breakage will be fixed append-cflags -fno-strict-aliasing + if use prometheus-exporter; then + EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" + fi + # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]} emake -C contrib/systemd SBINDIR=/usr/sbin if use tools ; then diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml index 6a09dde73e2..bb3436846b4 100644 --- a/net-proxy/haproxy/metadata.xml +++ b/net-proxy/haproxy/metadata.xml @@ -23,6 +23,7 @@ <flag name="pcre-jit">Use JIT support for PCRE</flag> <flag name="pcre2">Enable PCRE2 RegEx support</flag> <flag name="pcre2-jit">Use JIT support for PCRE2</flag> + <flag name="prometheus-exporter">Also build the prometheus exporter</flag> <flag name="slz">Use <pkg>dev-libs/libslz</pkg> compression library</flag> <flag name="tools">Install additional tools (halog, iprange)</flag> <flag name="device-atlas">Use <pkg>dev-libs/device-atlas-api-c</pkg> library</flag>