Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Jun 2021 11:28:45 GMT
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e1447306b7cb - main - net/haproxy: fix build with Prometheus exporter enabled.
Message-ID:  <202106181128.15IBSj5p046557@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by demon:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e1447306b7cb864cb73987da0ccd69b0de147b52

commit e1447306b7cb864cb73987da0ccd69b0de147b52
Author:     Dmitry Sivachenko <demon@FreeBSD.org>
AuthorDate: 2021-06-18 11:27:29 +0000
Commit:     Dmitry Sivachenko <demon@FreeBSD.org>
CommitDate: 2021-06-18 11:28:38 +0000

    net/haproxy: fix build with Prometheus exporter enabled.
    
    Reported by: Johan Hendriks <joh.hendriks@gmail.com>
---
 net/haproxy-devel/Makefile | 2 +-
 net/haproxy/Makefile       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index f4e67b872b17..d2e04af71966 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -38,7 +38,7 @@ SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 SPCRE_MAKE_ARGS=	USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1
 DEVICEATLAS_LIB_DEPENDS=	libda.so:net/deviceatlas-enterprise-c
 DEVICEATLAS_MAKE_ARGS=		USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
-PROMEX_MAKE_ARGS=	EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+PROMEX_MAKE_ARGS=	USE_PROMEX=1
 OPENSSL_USES=		ssl
 OPENSSL_MAKE_ARGS=	USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC}
 LUA_USES=		lua:53
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 7f36e69edec2..875a163eb750 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -43,7 +43,7 @@ SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 SPCRE_MAKE_ARGS=	USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1
 DEVICEATLAS_LIB_DEPENDS=	libda.so:net/deviceatlas-enterprise-c
 DEVICEATLAS_MAKE_ARGS=		USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
-PROMEX_MAKE_ARGS=	EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+PROMEX_MAKE_ARGS=	USE_PROMEX=1
 OPENSSL_USES=		ssl
 OPENSSL_MAKE_ARGS=	USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC}
 LUA_USES=		lua:53



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106181128.15IBSj5p046557>