mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 08:30:47 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/fluent-bit: bump to version 3.1.3

Browse Source 
- Rebase second patch
- This bump will fix the following build failure with gcc >= 14 thanks to
  1f8a672dbd:

  In file included from /home/autobuild/autobuild/instance-12/output-1/build/fluent-bit-3.0.4/src/tls/flb_tls.c:24:
  /home/autobuild/autobuild/instance-12/output-1/build/fluent-bit-3.0.4/src/tls/openssl.c: In function 'tls_context_server_alpn_select_callback':
  /home/autobuild/autobuild/instance-12/output-1/build/fluent-bit-3.0.4/src/tls/openssl.c:220:40: error: passing argument 1 of 'SSL_select_next_proto' from incompatible pointer type [-Wincompatible-pointer-types]
    220 |         result = SSL_select_next_proto(out,
        |                                        ^~~
        |                                        |
        |                                        const unsigned char **

https://fluentbit.io/announcements/v3.1.3/
https://fluentbit.io/announcements/v3.1.2/
https://fluentbit.io/announcements/v3.1.1/
https://fluentbit.io/announcements/v3.1.0/
https://fluentbit.io/announcements/v3.0.7/
https://fluentbit.io/announcements/v3.0.6/
https://fluentbit.io/announcements/v3.0.5/

Fixes:
 - http://autobuild.buildroot.org/results/8f9fcc0ec9c915a40fe402d7c643fa83f7f6a261

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
2024-07-23 10:16:37 +02:00
committed by Thomas Petazzoni
parent eed618fc76
commit 618aaf07af
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch
View File

@@ -9,15 +9,17 @@ e.g. fluent-bit is a c-only library, so allow compilation without cxx
Upstream: https://github.com/confluentinc/librdkafka/pull/4366
Upstream: https://github.com/fluent/fluent-bit/pull/7765
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
[Fabrice: update for 3.1.3]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
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.3.0/CMakeLists.txt b/lib/librdkafka-2.3.0/CMakeLists.txt
diff --git a/lib/librdkafka-2.4.0/CMakeLists.txt b/lib/librdkafka-2.4.0/CMakeLists.txt
index 7f3dd0fc6..c1ee93062 100644
--- a/lib/librdkafka-2.3.0/CMakeLists.txt
+++ b/lib/librdkafka-2.3.0/CMakeLists.txt
--- a/lib/librdkafka-2.4.0/CMakeLists.txt
+++ b/lib/librdkafka-2.4.0/CMakeLists.txt
@@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2)
include("packaging/cmake/parseversion.cmake")
parseversion("src/rdkafka.h")
@@ -57,10 +59,10 @@ index 7f3dd0fc6..c1ee93062 100644
if(RDKAFKA_BUILD_EXAMPLES)
add_subdirectory(examples)
diff --git a/lib/librdkafka-2.3.0/examples/CMakeLists.txt b/lib/librdkafka-2.3.0/examples/CMakeLists.txt
diff --git a/lib/librdkafka-2.4.0/examples/CMakeLists.txt b/lib/librdkafka-2.4.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
--- a/lib/librdkafka-2.4.0/examples/CMakeLists.txt
+++ b/lib/librdkafka-2.4.0/examples/CMakeLists.txt
@@ -5,8 +5,10 @@ endif(WIN32)
add_executable(producer producer.c ${win32_sources})
target_link_libraries(producer PUBLIC rdkafka)

2
package/fluent-bit/fluent-bit.hash
View File

@@ -1,3 +1,3 @@
# Locally computed
sha256 b439f89e879e538849e9106fe450bcf58da5034dfc316af4d2a837423786ed11 fluent-bit-3.0.4.tar.gz
sha256 4c745066223811047e3911c19db118eadec579ca62ef833a1b1fb573acd8cb85 fluent-bit-3.1.3.tar.gz
sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE

2
package/fluent-bit/fluent-bit.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
FLUENT_BIT_VERSION = 3.0.4
FLUENT_BIT_VERSION = 3.1.3
FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION))
FLUENT_BIT_LICENSE = Apache-2.0
FLUENT_BIT_LICENSE_FILES = LICENSE