From patchwork Fri Nov 29 21:38:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: patrick@subset.ch X-Patchwork-Id: 53386 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80802D72A1F for ; Fri, 29 Nov 2024 21:39:17 +0000 (UTC) Received: from qs51p00im-qukt01072701.me.com (qs51p00im-qukt01072701.me.com [17.57.155.16]) by mx.groups.io with SMTP id smtpd.web10.123494.1732916355623225841 for ; Fri, 29 Nov 2024 13:39:15 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@subset.ch header.s=sig1 header.b=VkXZKGlB; spf=pass (domain: subset.ch, ip: 17.57.155.16, mailfrom: patrick@subset.ch) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=subset.ch; s=sig1; t=1732916354; bh=OUwwaFERKKR0IydwoU2FnjjVChDNqzQuzGhWNyGyicw=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=VkXZKGlBp7XPBpEBsGiKJ8p3/RPukk88eFLDbvx5APz6L4WD7dC5Qms1PzlAznKNE +guKFbGSwX7nQeC/swfcaZa+h/QhnCt4230N3LrUyaeHKW7uoZWhYiwy2+xFTUoMId PqRZgK2fOuEggDxUNlq0Cnf9CAQGpcYEwsEtHSCRb1df8OAOpDw4NY/Gmjr81ZBEbO CcewEYeu65YTZySMnh3mZlvzsRR2finBHn1Pj0NxaWb23VorNcV5yYv1wvpQFG0e6y KUH5MI/FNjSlDcMI5FNRgVSPB5RqB9iEOPGzcw8Xo21zsj9INMrQ8GeuGZHB5ExJ0A 8fh8mk+ZowPdA== Received: from localhost.localdomain (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01072701.me.com (Postfix) with ESMTPSA id CE3F315C061E; Fri, 29 Nov 2024 21:39:13 +0000 (UTC) From: patrick@subset.ch To: openembedded-devel@lists.openembedded.org Cc: Patrick Wicki Subject: [meta-oe][PATCH 2/2] fluentbit: use system libs instead of vendored ones Date: Fri, 29 Nov 2024 22:38:37 +0100 Message-ID: <20241129213837.523955-2-patrick@subset.ch> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241129213837.523955-1-patrick@subset.ch> References: <20241129213837.523955-1-patrick@subset.ch> MIME-Version: 1.0 X-Proofpoint-GUID: _3dInhWSxDxTYJhM_GB6AEenz3k9A7m_ X-Proofpoint-ORIG-GUID: _3dInhWSxDxTYJhM_GB6AEenz3k9A7m_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2024-11-29_18,2024-11-28_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 clxscore=1030 adultscore=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2411290174 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Nov 2024 21:39:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114123 From: Patrick Wicki Make use of the new build option to unbundle some vendored dependencies. Currently supported are libbacktrace, c-ares, jemalloc, luajit and nghttp, all of which have Yocto recipes. librdkafka is currently below the required version (>=2.3.0) so for that it will fall back to the vendored version. Signed-off-by: Patrick Wicki --- meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb index 54fa9b277..b895c7da0 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb @@ -43,6 +43,7 @@ PACKAGECONFIG ??= "\ ipo \ metrics \ parser \ + prefer-system-libs \ proxy-go \ record-accessor \ regex \ @@ -56,6 +57,12 @@ PACKAGECONFIG ??= "\ # See https://github.com/fluent/fluent-bit/issues/7248#issuecomment-1631280496 PACKAGECONFIG:remove:toolchain-clang = "ipo" +# Use system libs +PACKAGECONFIG[prefer-system-libs] = "-DFLB_PREFER_SYSTEM_LIBS=Yes,-DFLB_PREFER_SYSTEM_LIBS=No, nghttp2 c-ares" +DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs backtrace', 'libbacktrace', '', d)}" +DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs jemalloc', 'jemalloc', '', d)}" +DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs luajit', 'luajit', '', d)}" + PACKAGECONFIG[all] = "-DFLB_ALL=Yes,-DFLB_ALL=No" PACKAGECONFIG[arrow] = "-DFLB_ARROW=Yes,-DFLB_ARROW=No" PACKAGECONFIG[avro-encoder] = "-DFLB_AVRO_ENCODER=Yes,-DFLB_AVRO_ENCODER=No" @@ -105,8 +112,8 @@ PACKAGECONFIG[windows-defaults] = "-DFLB_WINDOWS_DEFAULTS=Yes,-DFLB_WINDOWS_DEFA PACKAGECONFIG[minimal] = "-DFLB_MINIMAL=Yes,-DFLB_MINIMAL=No" # Without zstd dependency, kafka plugin build fails at link attempt against native libzstd.so -PACKAGECONFIG[in-kafka] = "-DFLB_IN_KAFKA=ON,-DFLB_IN_KAFKA=OFF,librdkafka zstd" -PACKAGECONFIG[out-kafka] = "-DFLB_OUT_KAFKA=ON,-DFLB_OUT_KAFKA=OFF,librdkafka zstd" +PACKAGECONFIG[in-kafka] = "-DFLB_IN_KAFKA=ON,-DFLB_IN_KAFKA=OFF,librdkafka zstd curl" +PACKAGECONFIG[out-kafka] = "-DFLB_OUT_KAFKA=ON,-DFLB_OUT_KAFKA=OFF,librdkafka zstd curl" SYSTEMD_SERVICE:${PN} = "fluent-bit.service"