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