mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-09 04:11:16 +00:00
Code Issues Projects Releases Wiki Activity

fluentbit: Upgrade to 1.9.9

Browse Source 
Disable incompatible-pointer-types warning as error to fix build
with gcc-14

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2024-05-09 17:55:28 -07:00
parent 064f6fae4f
commit de813392cf
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
+6 -12
View File
@@ -15,8 +15,6 @@ Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492]
lib/cmetrics/CMakeLists.txt | 7 +------ lib/cmetrics/CMakeLists.txt | 7 +------
3 files changed, 3 insertions(+), 17 deletions(-) 3 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dba5a8..d94b988 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -46,11 +46,7 @@ else() @@ -46,11 +46,7 @@ else()
@@ -32,8 +30,6 @@ index 3dba5a8..d94b988 100644
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l") if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic") set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic")
diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt
index bbe1f39..809ea93 100644
--- a/lib/chunkio/CMakeLists.txt --- a/lib/chunkio/CMakeLists.txt
+++ b/lib/chunkio/CMakeLists.txt +++ b/lib/chunkio/CMakeLists.txt
@@ -14,12 +14,7 @@ else() @@ -14,12 +14,7 @@ else()
@@ -50,21 +46,19 @@ index bbe1f39..809ea93 100644
include(cmake/macros.cmake) include(cmake/macros.cmake)
diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
index 60e8774..e3d6149 100644
--- a/lib/cmetrics/CMakeLists.txt --- a/lib/cmetrics/CMakeLists.txt
+++ b/lib/cmetrics/CMakeLists.txt +++ b/lib/cmetrics/CMakeLists.txt
@@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR 3) @@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR 3)
set(CMT_VERSION_PATCH 5) set(CMT_VERSION_PATCH 7)
set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}") set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
-# Define __FILENAME__ consistently across Operating Systems -# Define __CMT_FILENAME__ consistently across Operating Systems
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
-else() -else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
-endif() -endif()
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
# Configuration options # Configuration options
option(CMT_DEV "Enable development mode" No) option(CMT_DEV "Enable development mode" No)
meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb → meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb
+4 -1
View File
@@ -29,7 +29,7 @@ SRC_URI:append:libc-musl = "\
file://0001-Use-posix-strerror_r-with-musl.patch \ file://0001-Use-posix-strerror_r-with-musl.patch \
file://0002-chunkio-Link-with-fts-library-with-musl.patch \ file://0002-chunkio-Link-with-fts-library-with-musl.patch \
" "
SRC_URI[sha256sum] = "8ca2ac081d7eee717483c06608adcb5e3d5373e182ad87dba21a23f8278c6540" SRC_URI[sha256sum] = "3f6cd4bd1894cda16b465aef6ffec7e920d54c4209b3e2320fcffe7ae345700e"
S = "${WORKDIR}/fluent-bit-${PV}" S = "${WORKDIR}/fluent-bit-${PV}"
DEPENDS = "zlib bison-native flex-native openssl" DEPENDS = "zlib bison-native flex-native openssl"
@@ -84,6 +84,9 @@ EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2" CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2"
# Fixes build with GCC-14
CFLAGS += "-Wno-error=incompatible-pointer-types"
inherit cmake systemd pkgconfig inherit cmake systemd pkgconfig
SYSTEMD_SERVICE:${PN} = "td-agent-bit.service" SYSTEMD_SERVICE:${PN} = "td-agent-bit.service"