git: 150ff9dd33d5 - main - sysutils/fluent-bit: Unbreak on HEAD

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sat, 29 Apr 2023 22:52:10 UTC

The branch main has been updated by bofh:

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

commit 150ff9dd33d5bad2eec87aac42a8a5c21c0a5638
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-04-29 20:25:44 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-04-29 22:51:59 +0000

    sysutils/fluent-bit: Unbreak on HEAD
    
    Approved by:    portmgr (blanket)
---
 sysutils/fluent-bit/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile
index 5d8761a7887e..7515112d58db 100644
--- a/sysutils/fluent-bit/Makefile
+++ b/sysutils/fluent-bit/Makefile
@@ -15,15 +15,14 @@ BROKEN_mips64=		fails to build: conflicting types for 'restrict'
 USE_GITHUB=	yes
 GH_ACCOUNT=	fluent
 
-USES=		cmake:noninja gmake bison
+USES=		bison cmake:noninja gmake localbase:ldflags
 
 OPTIONS_DEFINE=		SSL PGSQL
 OPTIONS_DEFAULT=	SSL
 
 LIB_DEPENDS=		libyaml.so:textproc/libyaml
-LDFLAGS+=		-lexecinfo -L${LOCALBASE}/lib
+LDFLAGS+=		-lexecinfo
 CMAKE_ARGS=		-DFLB_DEBUG=Off -DFLB_TRACE=Off -DFLB_LUAJIT=Off
-CFLAGS+=		-I${LOCALBASE}/include
 
 SSL_USES=		ssl
 SSL_CMAKE_ON=		-DFLB_TLS=On
@@ -49,6 +48,10 @@ USES+=		compiler:gcc-c++11-lib
 USES+=		compiler:c11
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/parsers.conf ${STAGEDIR}${ETCDIR}/parsers.conf.sample