From nobody Fri Jul 26 12:57:31 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WVnpg4Mn0z5S4sY; Fri, 26 Jul 2024 12:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WVnpg3qvMz4hCs; Fri, 26 Jul 2024 12:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721998651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6xQrTUK4QjNlvVd/4n8ozpjhRkpRuKrx7SS4Iza5+4=; b=j7MgsRCQww/tR5UGhZpAEN+fNDqd1JsC4O2s2pZ8VPNYNISwpi0aLgMOshgnVUWW8oBpiN pHZ4GBnGT1Melcj68uirPLzbOv+buvb9XTB5LQD8W8Y5lkEYwPzkVFtwKQ4qZ548Qc4y6T d9KMaSwnz0RT5rj0Nf0P7lVvMKupDmZI868laAGYYwG1Hak97LPPd0sb7QFZ2l5FBmsFXq w4pOhXJXvj2jmQ1PZqm3B1TrYe9vW3e+GB8mGDm72KuNdCtkN7yAqHwokMGmopS3/gVl0m 7aIGlQXPdPSDdl7vAzaXoPRI79f+EqZNYjznfkEEEe9BjMrOXYNqGc/lYJh/vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721998651; a=rsa-sha256; cv=none; b=TvqfTHfVHPzCpW1k9X6Oi/nvVOjqLSNcy8qmBqc+q45p36Kgj3Za7AqpTbPbez4gHUzh9n 1FN0Al1lLqAjnoNSpull+8I9hzf7VQS+CjlbQedZm7iFb4wSjBXLBQ91orU9UBDuNlsM7i 5rzxKYFBvMg6SRyng0SNUWtlRAEzV2/7DmXslbNijfcaDbgMcCxw85oeWIQy57E7haHeO7 IwzXMErp3oJ0rJ2k6AUuLhQau8aSsMhR5dXm/RI+uCNH79e0rBEaAr+txB4W4+ylgHeV/g bBXeFOkCeHHG9Z81nvaRjK/ocESRzw1EYywl2p5g2H5IB3PmfXC8bzfB37jqMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721998651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6xQrTUK4QjNlvVd/4n8ozpjhRkpRuKrx7SS4Iza5+4=; b=xrm7rKAKkU+i/IXEiAEku8/GRbWUOpXJVAppGDwpNXFer/gd5YGaJY2Nhp/QU7WFfBWPwj KsTKcczP0iUITLCC3FveyKq+Ge+hHWq7A7+wMIMyfLvGBbNwF6uuS7DadkkClI0tt1Uaof SBb0/VWUzHZ5X7eiRPBLKFGR/RYznhARSSsbikAqthgz7i2jopwu3QdWZduCfgOAuKjQxj UrfLVX05exdiSL6hIdZPWiWyLVMhLA61Xz8+Oo00xWs8tcmtieBPgJp8HxHgRA5R1vvsmk pWThyschJv/+RvLA7l1zFoR/JLwd6yPgvx37r0b8N3W4jB42Yoas12t3ujR8Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WVnpg3RN3zNwR; Fri, 26 Jul 2024 12:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46QCvV6h005785; Fri, 26 Jul 2024 12:57:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46QCvV2s005782; Fri, 26 Jul 2024 12:57:31 GMT (envelope-from git) Date: Fri, 26 Jul 2024 12:57:31 GMT Message-Id: <202407261257.46QCvV2s005782@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6c9d67008917 - main - sysutils/fluent-bit: Clean up the makefile List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c9d67008917466915f15e47d09712270bd27baa Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c9d67008917466915f15e47d09712270bd27baa commit 6c9d67008917466915f15e47d09712270bd27baa Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-07-25 12:27:06 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-07-26 12:53:23 +0000 sysutils/fluent-bit: Clean up the makefile No functional changes intended. Approved by: portmgr blanket Sponsored by: trivago N.V. Sponsored by: Klara, Inc. --- sysutils/fluent-bit/Makefile | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index cb7b0b008b3e..5aa86d960292 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -9,25 +9,24 @@ WWW= https://fluentbit.io/ LICENSE= APACHE20 -BROKEN_mips= fails to build: conflicting types for 'restrict' -BROKEN_mips64= fails to build: conflicting types for 'restrict' +BROKEN_mips= fails to build: conflicting types for 'restrict' +BROKEN_mips64= fails to build: conflicting types for 'restrict' +LIB_DEPENDS= libyaml.so:textproc/libyaml + +USES= bison cmake:noninja compiler:c11 gmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= fluent +USE_RC_SUBR= ${PORTNAME} -USES= bison cmake:noninja compiler:c11 gmake localbase:ldflags +CMAKE_ARGS= -DFLB_DEBUG=Off \ + -DFLB_LUAJIT=Off \ + -DFLB_TRACE=Off +LDFLAGS+= -lexecinfo -OPTIONS_DEFINE= SSL PGSQL +OPTIONS_DEFINE= PGSQL SSL OPTIONS_DEFAULT= SSL -LIB_DEPENDS= libyaml.so:textproc/libyaml -LDFLAGS+= -lexecinfo -CMAKE_ARGS= -DFLB_DEBUG=Off -DFLB_TRACE=Off -DFLB_LUAJIT=Off - -SSL_USES= ssl -SSL_CMAKE_ON= -DFLB_TLS=On -SSL_CMAKE_OFF= -DFLB_TLS=Off - EXAMPLES_CMAKE_ON= -DFLB_EXAMPLES=On EXAMPLES_CMAKE_OFF= -DFLB_EXAMPLES=Off @@ -35,11 +34,14 @@ PGSQL_USES= pgsql PGSQL_CMAKE_ON= -DFLB_OUT_PGSQL=On PGSQL_CMAKE_OFF= -DFLB_OUT_PGSQL=Off -USE_RC_SUBR= ${PORTNAME} +SSL_USES= ssl +SSL_CMAKE_ON= -DFLB_TLS=On +SSL_CMAKE_OFF= -DFLB_TLS=Off .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400079 || (${OSVERSION} >= 1302505 && \ + ${OSVERSION} < 1400000)) CFLAGS+= -Wno-error=int-conversion .endif