From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E7CA5138334 for ; Mon, 24 Jun 2019 13:03:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0400AE088C; Mon, 24 Jun 2019 13:03:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2ABCE088C for ; Mon, 24 Jun 2019 13:03:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 369573468C7 for ; Mon, 24 Jun 2019 13:03:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB12B618 for ; Mon, 24 Jun 2019 13:03:51 +0000 (UTC) From: "Christian Ruppert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christian Ruppert" Message-ID: <1561381424.fa6b72f161927f3fdb75cfb805fa8bf3c7906432.idl0r@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/haproxy/haproxy-2.0.0.ebuild net-proxy/haproxy/metadata.xml X-VCS-Directories: net-proxy/haproxy/ X-VCS-Committer: idl0r X-VCS-Committer-Name: Christian Ruppert X-VCS-Revision: fa6b72f161927f3fdb75cfb805fa8bf3c7906432 X-VCS-Branch: master Date: Mon, 24 Jun 2019 13:03:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0fc434dc-e234-4b93-b28c-1aafda54723e X-Archives-Hash: 8ec444ddd3b07150e8636dd9b7907153 commit: fa6b72f161927f3fdb75cfb805fa8bf3c7906432 Author: Christian Ruppert gentoo org> AuthorDate: Mon Jun 24 13:03:24 2019 +0000 Commit: Christian Ruppert gentoo 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 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 @@ Use JIT support for PCRE Enable PCRE2 RegEx support Use JIT support for PCRE2 + Also build the prometheus exporter Use dev-libs/libslz compression library Install additional tools (halog, iprange) Use dev-libs/device-atlas-api-c library