diff mbox series

[meta-oe,4/4] fluentbit: Upgrade to 1.9.9

Message ID 20240510005731.2074507-4-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,1/4] fvwm: Fix build with gcc-14 | expand

Commit Message

Khem Raj May 10, 2024, 12:57 a.m. UTC 
Disable incompatible-pointer-types warning as error to fix build
with gcc-14

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...xt-Do-not-use-private-makefile-target.patch | 18 ++++++------------
 .../{fluentbit_1.9.7.bb => fluentbit_1.9.9.bb} |  5 ++++-
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename meta-oe/recipes-extended/fluentbit/{fluentbit_1.9.7.bb => fluentbit_1.9.9.bb} (95%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
index f5a1716c07..0cabed9633 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
@@ -15,8 +15,6 @@  Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492]
  lib/cmetrics/CMakeLists.txt | 7 +------
  3 files changed, 3 insertions(+), 17 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3dba5a8..d94b988 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -46,11 +46,7 @@ else()
@@ -32,8 +30,6 @@  index 3dba5a8..d94b988 100644
  
  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
    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
 +++ b/lib/chunkio/CMakeLists.txt
 @@ -14,12 +14,7 @@ else()
@@ -50,21 +46,19 @@  index bbe1f39..809ea93 100644
  
  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
 +++ b/lib/cmetrics/CMakeLists.txt
 @@ -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}")
  
--# Define __FILENAME__ consistently across Operating Systems
+-# Define __CMT_FILENAME__ consistently across Operating Systems
 -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()
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
 -endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
  
  # Configuration options
- option(CMT_DEV             "Enable development mode"                   No)
+ option(CMT_DEV                       "Enable development mode"                   No)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb
similarity index 95%
rename from meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
rename to meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb
index fc06095475..ef04111131 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb
@@ -29,7 +29,7 @@  SRC_URI:append:libc-musl = "\
            file://0001-Use-posix-strerror_r-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}"
 
 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"
 
+# Fixes build with GCC-14
+CFLAGS += "-Wno-error=incompatible-pointer-types"
+
 inherit cmake systemd pkgconfig
 
 SYSTEMD_SERVICE:${PN} = "td-agent-bit.service"