Skip to content

Commit

Permalink
package/fluent-bit: bump to 3.2.3
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
ThomasDevoogdt committed Dec 20, 2024
1 parent 6e06015 commit 17057e3
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 192 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c44256c95f5703dd627413f17c6ad250073898d9 Mon Sep 17 00:00:00 2001
From f7b6c80e551f218f00ee30978e4f0ac09e1bfeee Mon Sep 17 00:00:00 2001
From: Thomas Devoogdt <[email protected]>
Date: Tue, 25 Jul 2023 09:10:41 +0200
Subject: [PATCH] lib: librdkafka: CMakeLists.txt: allow compilation without
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0dc955cd15cc0b09a1d557131fae59842cb2bbd8 Mon Sep 17 00:00:00 2001
From 9ecd97452709e415803213af423cb806b9d00506 Mon Sep 17 00:00:00 2001
From: Thomas Devoogdt <[email protected]>
Date: Tue, 25 Jul 2023 10:00:36 +0200
Subject: [PATCH] build: disable cxx support for librdkafka #7741
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8a9aed874fc41973d007f5145eca85e261f2bb35 Mon Sep 17 00:00:00 2001
From ddb47cc1137bb7f3a41a9286084d5372c85ebfb7 Mon Sep 17 00:00:00 2001
From: Thomas Devoogdt <[email protected]>
Date: Sun, 25 Aug 2024 20:09:21 +0200
Subject: [PATCH] lib: nghttp2: CMakeLists.txt: do not require a CXX compiler
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ac870a2e2de899bcc8b6818b97404479da6d0663 Mon Sep 17 00:00:00 2001
From c93f32bb510b3268165f2985e622140fb35aaa20 Mon Sep 17 00:00:00 2001
From: Thomas Devoogdt <[email protected]>
Date: Sun, 25 Aug 2024 20:10:27 +0200
Subject: [PATCH] lib: luajit-cmake: CMakeLists.txt: do not require a CXX
Expand Down

This file was deleted.

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

This file was deleted.

2 changes: 1 addition & 1 deletion package/fluent-bit/fluent-bit.hash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally computed
sha256 3abcd7eda1a26fe79f1d715491bafcca77d0186cc46d1d8465157790358f827d fluent-bit-3.2.2.tar.gz
sha256 6a533d7f0f488d5fb707fead07f3ad147b300fb87cbd7b8ec461cc1de3607d80 fluent-bit-3.2.3.tar.gz
sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE
7 changes: 1 addition & 6 deletions package/fluent-bit/fluent-bit.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

FLUENT_BIT_VERSION = 3.2.2
FLUENT_BIT_VERSION = 3.2.3
FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION))
FLUENT_BIT_LICENSE = Apache-2.0
FLUENT_BIT_LICENSE_FILES = LICENSE
Expand Down Expand Up @@ -63,11 +63,6 @@ else
FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=No
endif

# Force bundled miniz to be linked statically.
# https://github.com/fluent/fluent-bit/issues/6711
FLUENT_BIT_CONF_OPTS += \
-DBUILD_SHARED_LIBS=OFF

# Move the config files from /usr/etc/ to /etc/.
# https://github.com/fluent/fluent-bit/issues/6619
FLUENT_BIT_CONF_OPTS += \
Expand Down

0 comments on commit 17057e3

Please sign in to comment.