| 1 |
commit: fd380f32c4a4c524306c7724a4e105f182439d09 |
| 2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 27 09:27:57 2019 +0000 |
| 4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 27 09:51:37 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd380f32 |
| 7 |
|
| 8 |
net-proxy/haproxy: Update haproxy-2.0.9999.ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 11 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
| 12 |
|
| 13 |
net-proxy/haproxy/haproxy-2.0.9999.ebuild | 10 +++++++--- |
| 14 |
1 file changed, 7 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild |
| 17 |
index c920acfec53..06e10c93669 100644 |
| 18 |
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild |
| 19 |
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild |
| 20 |
@@ -20,8 +20,8 @@ fi |
| 21 |
|
| 22 |
LICENSE="GPL-2 LGPL-2.1" |
| 23 |
SLOT="0" |
| 24 |
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit ssl |
| 25 |
-systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
| 26 |
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter |
| 27 |
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
| 28 |
REQUIRED_USE="pcre-jit? ( pcre ) |
| 29 |
pcre2-jit? ( pcre2 ) |
| 30 |
pcre? ( !pcre2 ) |
| 31 |
@@ -98,8 +98,12 @@ src_compile() { |
| 32 |
# For now, until the strict-aliasing breakage will be fixed |
| 33 |
append-cflags -fno-strict-aliasing |
| 34 |
|
| 35 |
+ if use prometheus-exporter; then |
| 36 |
+ EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
| 37 |
+ fi |
| 38 |
+ |
| 39 |
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
| 40 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
| 41 |
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]} |
| 42 |
emake -C contrib/systemd SBINDIR=/usr/sbin |
| 43 |
|
| 44 |
if use tools ; then |
Archives