package/fluent-bit: bump to v2.2.2
PATCH 1/1 package/fluent-bit: bump to v2.2.2
A bunch of release notes:
https://fluentbit.io/announcements/v2.1.8
https://fluentbit.io/announcements/v2.1.9
https://fluentbit.io/announcements/v2.1.10
https://fluentbit.io/announcements/v2.2.0
https://fluentbit.io/announcements/v2.2.1
https://fluentbit.io/announcements/v2.2.2
In addition:
- Dropped -fcommon fix for monkey (multiple definitions of `mk_tls_*'), as this is fixed upstream [1].
- Added WAMR related patches.
- Rebased the patches for v2.2.2.
[1] https://github.com/monkey/monkey/commit/627422b901af5c3c5b770d02c4a4567a0a8a61e6.
--- ...-the-system-provided-LuaJIT-if-found.patch | 12 +-- ...MakeLists.txt-allow-compilation-with.patch | 25 ++--- ...isable-cxx-support-for-librdkafka-77.patch | 8 +- ...estore-support-for-some-targets-8401.patch | 43 ++++++++ ...write-gs-base-with-cmake-variable-30.patch | 99 +++++++++++++++++++ package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 6 +- 7 files changed, 167 insertions(+), 28 deletions(-) create mode 100644 package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch create mode 100644 package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch
package/fluent-bit/0001-build-use-the-system-provided-LuaJIT-if-found.patch +6 -6
@@ -1,4 +1,4 @@ -From 4f8eb7bb5a39d83374806928b7a5b622136ef055 Mon Sep 17 00:00:00 2001 +From 8d6f6cfb07a8fe32dc0b9577e1b2f1ee1b67b736 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt <[email protected]> Date: Fri, 28 Apr 2023 10:25:16 +0200 Subject: [PATCH] build: use the system provided LuaJIT if found
@@ -15,10 +15,10 @@ Signed-off-by: Thomas Devoogdt <[email protected]> 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9af783c79..0601b7c18 100644 +index 2da792d53..3229420c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -123,6 +123,7 @@ option(FLB_TESTS_INTERNAL_FUZZ "Enable internal fuzz tests" No) +@@ -128,6 +128,7 @@ option(FLB_TESTS_INTERNAL_FUZZ "Enable internal fuzz tests" No) option(FLB_TESTS_OSSFUZZ "Enable OSS-Fuzz build" No) option(FLB_MTRACE "Enable mtrace support" No) option(FLB_POSIX_TLS "Force POSIX thread storage" No)
@@ -26,7 +26,7 @@ index 9af783c79..0601b7c18 100644 option(FLB_INOTIFY "Enable inotify support" Yes) option(FLB_SQLDB "Enable SQL embedded DB" Yes) option(FLB_HTTP_SERVER "Enable HTTP Server" Yes) -@@ -1003,7 +1004,16 @@ endif() +@@ -1023,7 +1024,16 @@ endif() # LuaJIT (Scripting Support) # ========================== if(FLB_LUAJIT)
@@ -45,10 +45,10 @@ index 9af783c79..0601b7c18 100644 endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 06a206dd4..8b66ddd22 100644 +index b6233d9f7..67baec456 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -220,7 +220,7 @@ endif() +@@ -221,7 +221,7 @@ endif() if(FLB_LUAJIT) set(extra_libs ${extra_libs}
package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch +13 -12
@@ -1,4 +1,4 @@ -From d5492ae7a0fa4e2c19b1d091ad28133fed53d8e2 Mon Sep 17 00:00:00 2001 +From 29be5275f6f7e15aca768e9b235998abc5a604e2 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
@@ -10,14 +10,14 @@ Upstream: https://github.com/confluentinc/librdkafka/pull/4366 Upstream: https://github.com/fluent/fluent-bit/pull/7765 Signed-off-by: Thomas Devoogdt <[email protected]> --- - lib/librdkafka-2.1.0/CMakeLists.txt | 18 ++++++++++-- - lib/librdkafka-2.1.0/examples/CMakeLists.txt | 30 +++++++++++++------- - 2 files changed, 35 insertions(+), 13 deletions(-) + lib/librdkafka-2.3.0/CMakeLists.txt | 18 ++++++++++-- + lib/librdkafka-2.3.0/examples/CMakeLists.txt | 31 +++++++++++++------- + 2 files changed, 35 insertions(+), 14 deletions(-) -diff --git a/lib/librdkafka-2.1.0/CMakeLists.txt b/lib/librdkafka-2.1.0/CMakeLists.txt +diff --git a/lib/librdkafka-2.3.0/CMakeLists.txt b/lib/librdkafka-2.3.0/CMakeLists.txt index 7f3dd0fc6..c1ee93062 100644 ---- a/lib/librdkafka-2.1.0/CMakeLists.txt -+++ b/lib/librdkafka-2.1.0/CMakeLists.txt +--- a/lib/librdkafka-2.3.0/CMakeLists.txt ++++ b/lib/librdkafka-2.3.0/CMakeLists.txt @@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2) include("packaging/cmake/parseversion.cmake") parseversion("src/rdkafka.h")
@@ -57,10 +57,10 @@ index 7f3dd0fc6..c1ee93062 100644 if(RDKAFKA_BUILD_EXAMPLES) add_subdirectory(examples) -diff --git a/lib/librdkafka-2.1.0/examples/CMakeLists.txt b/lib/librdkafka-2.1.0/examples/CMakeLists.txt -index bbbb89ad9..51b8b04be 100644 ---- a/lib/librdkafka-2.1.0/examples/CMakeLists.txt -+++ b/lib/librdkafka-2.1.0/examples/CMakeLists.txt +diff --git a/lib/librdkafka-2.3.0/examples/CMakeLists.txt b/lib/librdkafka-2.3.0/examples/CMakeLists.txt +index 8c0079abe..c9336b729 100644 +--- a/lib/librdkafka-2.3.0/examples/CMakeLists.txt ++++ b/lib/librdkafka-2.3.0/examples/CMakeLists.txt @@ -5,8 +5,10 @@ endif(WIN32) add_executable(producer producer.c ${win32_sources}) target_link_libraries(producer PUBLIC rdkafka)
@@ -101,12 +101,13 @@ index bbbb89ad9..51b8b04be 100644 add_executable(misc misc.c ${win32_sources}) target_link_libraries(misc PUBLIC rdkafka) -@@ -35,6 +43,8 @@ if(NOT WIN32) +@@ -70,7 +78,8 @@ if(NOT WIN32) add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c) target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka) - add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) - target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++) +- + if(RDKAFKA_BUILD_CXX) + add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) + target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch +4 -4
@@ -1,4 +1,4 @@ -From f5303533fb64bf038dbd8203ac52d94819346239 Mon Sep 17 00:00:00 2001 +From 7f3fc55b734db2d28af63c393b52bc238af9f20a Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt <[email protected]> Date: Tue, 25 Jul 2023 10:00:36 +0200 Subject: [PATCH] CMakeLists.txt: disable cxx support for librdkafka #7741
@@ -6,17 +6,17 @@ Subject: [PATCH] CMakeLists.txt: disable cxx support for librdkafka #7741 Fluent-bit is c only, so no need to compile cxx. This fixes also a compile error in buildroot. -Upstream: https://github.com/fluent/fluent-bit/pull/7765/commits +Upstream: https://github.com/fluent/fluent-bit/pull/7765 Signed-off-by: Thomas Devoogdt <[email protected]> --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index df6b283cf..10e6071f3 100644 +index 3229420c6..2694f189f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -967,6 +967,7 @@ if(FLB_BACKTRACE) +@@ -979,6 +979,7 @@ if(FLB_BACKTRACE) endif() if(FLB_IN_KAFKA OR FLB_OUT_KAFKA)
package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch new file +43 -0
43 lines not on this page · raw message
package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch new file +99 -0
99 lines not on this page · raw message
package/fluent-bit/fluent-bit.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 ed80291d660be19f8458d81796c7d3f7e8735eb48ec393467a0c9deca2e9abc3 fluent-bit-2.1.7.tar.gz +sha256 8e7e951b2907e9d29508699c71c8949a4a22d750d54ffa5ee5b96537e59371dd fluent-bit-2.2.2.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE
package/fluent-bit/fluent-bit.mk +1 -5
@@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.1.7 +FLUENT_BIT_VERSION = 2.2.2 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE
@@ -55,10 +55,6 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" -# Fix multiple definition of `mk_tls_*'. -# https://github.com/fluent/fluent-bit/issues/5537 -FLUENT_BIT_CFLAGS += -fcommon - # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. # https://bugzilla.redhat.com/show_bug.cgi?id=574992
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Devoogdt <[email protected]> writes:
A bunch of release notes:
https://fluentbit.io/announcements/v2.1.8
https://fluentbit.io/announcements/v2.1.9
https://fluentbit.io/announcements/v2.1.10
https://fluentbit.io/announcements/v2.2.0
https://fluentbit.io/announcements/v2.2.1
https://fluentbit.io/announcements/v2.2.2In addition:
- Dropped -fcommon fix for monkey (multiple definitions of `mk_tls_*'), as this is fixed upstream [1].
Quoted 7 lines
- Added WAMR related patches.
- Rebased the patches for v2.2.2.
[1] https://github.com/monkey/monkey/commit/627422b901af5c3c5b770d02c4a4567a0a8a61e6.
Signed-off-by Thomas Devoogdt <[email protected]>
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot