Skip to content

Commit 17057e3

Browse files
package/fluent-bit: bump to 3.2.3
News: - https://fluentbit.io/announcements/v3.2.3/ Two patches can be dropped due to upstream merges: - cprofiles: upgrade to v0.1.0 (PR fluent/fluent-bit#9747) - wasm-micro-runtime: Bump up wasm-micro-runtime to v1.3.3 (PR fluent/fluent-bit#9643) Also drop the BUILD_SHARED_LIBS override, since this has been fixed upstream. See commit richgel999/miniz@0ce345c. Signed-off-by: Thomas Devoogdt <[email protected]>
1 parent 6e06015 commit 17057e3

9 files changed

+7
-192
lines changed

package/fluent-bit/0001-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c44256c95f5703dd627413f17c6ad250073898d9 Mon Sep 17 00:00:00 2001
1+
From f7b6c80e551f218f00ee30978e4f0ac09e1bfeee Mon Sep 17 00:00:00 2001
22
From: Thomas Devoogdt <[email protected]>
33
Date: Tue, 25 Jul 2023 09:10:41 +0200
44
Subject: [PATCH] lib: librdkafka: CMakeLists.txt: allow compilation without

package/fluent-bit/0002-build-disable-cxx-support-for-librdkafka-7741.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0dc955cd15cc0b09a1d557131fae59842cb2bbd8 Mon Sep 17 00:00:00 2001
1+
From 9ecd97452709e415803213af423cb806b9d00506 Mon Sep 17 00:00:00 2001
22
From: Thomas Devoogdt <[email protected]>
33
Date: Tue, 25 Jul 2023 10:00:36 +0200
44
Subject: [PATCH] build: disable cxx support for librdkafka #7741

package/fluent-bit/0003-lib-nghttp2-CMakeLists.txt-do-not-require-a-CXX-comp.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8a9aed874fc41973d007f5145eca85e261f2bb35 Mon Sep 17 00:00:00 2001
1+
From ddb47cc1137bb7f3a41a9286084d5372c85ebfb7 Mon Sep 17 00:00:00 2001
22
From: Thomas Devoogdt <[email protected]>
33
Date: Sun, 25 Aug 2024 20:09:21 +0200
44
Subject: [PATCH] lib: nghttp2: CMakeLists.txt: do not require a CXX compiler

package/fluent-bit/0004-lib-luajit-cmake-CMakeLists.txt-do-not-require-a-CXX.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ac870a2e2de899bcc8b6818b97404479da6d0663 Mon Sep 17 00:00:00 2001
1+
From c93f32bb510b3268165f2985e622140fb35aaa20 Mon Sep 17 00:00:00 2001
22
From: Thomas Devoogdt <[email protected]>
33
Date: Sun, 25 Aug 2024 20:10:27 +0200
44
Subject: [PATCH] lib: luajit-cmake: CMakeLists.txt: do not require a CXX

package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch

Lines changed: 0 additions & 99 deletions
This file was deleted.

package/fluent-bit/0006-plugins-in-out-_kafka-CMakeLists.txt-fix-cross-compi.patch renamed to package/fluent-bit/0005-plugins-in-out-_kafka-CMakeLists.txt-fix-cross-compi.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7e8bb790cba0619af9e8d80e947f7cda0910caaa Mon Sep 17 00:00:00 2001
1+
From a1a7535084e746407b407aa077a12f7a38de818e Mon Sep 17 00:00:00 2001
22
From: Thomas Devoogdt <[email protected]>
33
Date: Sat, 16 Nov 2024 19:46:28 +0100
44
Subject: [PATCH] plugins/{in,out}_kafka/CMakeLists.txt: fix cross compile

package/fluent-bit/0007-lib-cprofiles-fix-wrong-pointer-assignment.patch

Lines changed: 0 additions & 81 deletions
This file was deleted.

package/fluent-bit/fluent-bit.hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Locally computed
2-
sha256 3abcd7eda1a26fe79f1d715491bafcca77d0186cc46d1d8465157790358f827d fluent-bit-3.2.2.tar.gz
2+
sha256 6a533d7f0f488d5fb707fead07f3ad147b300fb87cbd7b8ec461cc1de3607d80 fluent-bit-3.2.3.tar.gz
33
sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE

package/fluent-bit/fluent-bit.mk

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
FLUENT_BIT_VERSION = 3.2.2
7+
FLUENT_BIT_VERSION = 3.2.3
88
FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION))
99
FLUENT_BIT_LICENSE = Apache-2.0
1010
FLUENT_BIT_LICENSE_FILES = LICENSE
@@ -63,11 +63,6 @@ else
6363
FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=No
6464
endif
6565

66-
# Force bundled miniz to be linked statically.
67-
# https://github.com/fluent/fluent-bit/issues/6711
68-
FLUENT_BIT_CONF_OPTS += \
69-
-DBUILD_SHARED_LIBS=OFF
70-
7166
# Move the config files from /usr/etc/ to /etc/.
7267
# https://github.com/fluent/fluent-bit/issues/6619
7368
FLUENT_BIT_CONF_OPTS += \

0 commit comments

Comments
 (0)