From 05cc97c470c926ac8c5a10a6beee1c2ed97214ec Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Fri, 14 Mar 2025 21:50:31 +0100 Subject: [PATCH] fluentbit: drop compiler optimization package configs These manipulate compiler flags instead of using what yocto provides. * "coverage" adds paths to binaries and thus causes buildpaths errors * "small" strips binaries, so causes already-stripped error. * DEBUG_BUILD is the correct way to enable debug/release flags in yocto Signed-off-by: Peter Marko Signed-off-by: Khem Raj --- meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb index fbaee9e121..94fbed0962 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb @@ -48,7 +48,6 @@ PACKAGECONFIG ??= "\ proxy-go \ record-accessor \ regex \ - release \ signv4 \ sqldb \ stream-processor \ @@ -73,9 +72,7 @@ PACKAGECONFIG[backtrace] = "-DFLB_BACKTRACE=Yes,-DFLB_BACKTRACE=No" PACKAGECONFIG[binary] = "-DFLB_BINARY=Yes,-DFLB_BINARY=No" PACKAGECONFIG[chunk-trace] = "-DFLB_CHUNK_TRACE=Yes,-DFLB_CHUNK_TRACE=No" PACKAGECONFIG[config-yaml] = "-DFLB_CONFIG_YAML=Yes,-DFLB_CONFIG_YAML=No,libyaml" -PACKAGECONFIG[coverage] = "-DFLB_COVERAGE=Yes,-DFLB_COVERAGE=No" PACKAGECONFIG[custom-calyptia] = "-DFLB_CUSTOM_CALYPTIA=Yes,-DFLB_CUSTOM_CALYPTIA=No" -PACKAGECONFIG[debug] = "-DFLB_DEBUG=Yes,-DFLB_DEBUG=No" PACKAGECONFIG[enforce-alignment] = "-DFLB_ENFORCE_ALIGNMENT=Yes,-DFLB_ENFORCE_ALIGNMENT=No" PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=Yes,-DFLB_EXAMPLES=No" PACKAGECONFIG[http-client-debug] = "-DFLB_HTTP_CLIENT_DEBUG=Yes,-DFLB_HTTP_CLIENT_DEBUG=No" @@ -91,11 +88,9 @@ PACKAGECONFIG[posix-tls] = "-DFLB_POSIX_TLS=Yes,-DFLB_POSIX_TLS=No" PACKAGECONFIG[proxy-go] = "-DFLB_PROXY_GO=Yes,-DFLB_PROXY_GO=No" PACKAGECONFIG[record-accessor] = "-DFLB_RECORD_ACCESSOR=Yes,-DFLB_RECORD_ACCESSOR=No" PACKAGECONFIG[regex] = "-DFLB_REGEX=Yes,-DFLB_REGEX=No" -PACKAGECONFIG[release] = "-DFLB_RELEASE=Yes,-DFLB_RELEASE=No" PACKAGECONFIG[run-ldconfig] = "-DFLB_RUN_LDCONFIG=Yes,-DFLB_RUN_LDCONFIG=No" PACKAGECONFIG[shared-lib] = "-DFLB_SHARED_LIB=Yes,-DFLB_SHARED_LIB=No" PACKAGECONFIG[signv4] = "-DFLB_SIGNV4=Yes,-DFLB_SIGNV4=No" -PACKAGECONFIG[small] = "-DFLB_SMALL=Yes,-DFLB_SMALL=No" PACKAGECONFIG[sqldb] = "-DFLB_SQLDB=Yes,-DFLB_SQLDB=No" PACKAGECONFIG[stream-processor] = "-DFLB_STREAM_PROCESSOR=Yes,-DFLB_STREAM_PROCESSOR=No" PACKAGECONFIG[tests-runtime] = "-DFLB_TESTS_RUNTIME=Yes,-DFLB_TESTS_RUNTIME=No" @@ -119,6 +114,10 @@ SYSTEMD_SERVICE:${PN} = "fluent-bit.service" inherit cmake systemd pkgconfig +# disable manipulation of compiler flags and CMAKE_BUILD_TYPE +# release and coverage are off by default, disable also debug +EXTRA_OECMAKE += "-DFLB_DEBUG=No" + FULL_OPTIMIZATION:remove = "${@'-O2' if bb.data.inherits_class('clang', d) else ''}" TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}" TARGET_CC_ARCH:remove = "-D_FORTIFY_SOURCE=2"