diff options
| -rw-r--r-- | meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb | 9 |
1 files 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 ??= "\ | |||
| 48 | proxy-go \ | 48 | proxy-go \ |
| 49 | record-accessor \ | 49 | record-accessor \ |
| 50 | regex \ | 50 | regex \ |
| 51 | release \ | ||
| 52 | signv4 \ | 51 | signv4 \ |
| 53 | sqldb \ | 52 | sqldb \ |
| 54 | stream-processor \ | 53 | stream-processor \ |
| @@ -73,9 +72,7 @@ PACKAGECONFIG[backtrace] = "-DFLB_BACKTRACE=Yes,-DFLB_BACKTRACE=No" | |||
| 73 | PACKAGECONFIG[binary] = "-DFLB_BINARY=Yes,-DFLB_BINARY=No" | 72 | PACKAGECONFIG[binary] = "-DFLB_BINARY=Yes,-DFLB_BINARY=No" |
| 74 | PACKAGECONFIG[chunk-trace] = "-DFLB_CHUNK_TRACE=Yes,-DFLB_CHUNK_TRACE=No" | 73 | PACKAGECONFIG[chunk-trace] = "-DFLB_CHUNK_TRACE=Yes,-DFLB_CHUNK_TRACE=No" |
| 75 | PACKAGECONFIG[config-yaml] = "-DFLB_CONFIG_YAML=Yes,-DFLB_CONFIG_YAML=No,libyaml" | 74 | PACKAGECONFIG[config-yaml] = "-DFLB_CONFIG_YAML=Yes,-DFLB_CONFIG_YAML=No,libyaml" |
| 76 | PACKAGECONFIG[coverage] = "-DFLB_COVERAGE=Yes,-DFLB_COVERAGE=No" | ||
| 77 | PACKAGECONFIG[custom-calyptia] = "-DFLB_CUSTOM_CALYPTIA=Yes,-DFLB_CUSTOM_CALYPTIA=No" | 75 | PACKAGECONFIG[custom-calyptia] = "-DFLB_CUSTOM_CALYPTIA=Yes,-DFLB_CUSTOM_CALYPTIA=No" |
| 78 | PACKAGECONFIG[debug] = "-DFLB_DEBUG=Yes,-DFLB_DEBUG=No" | ||
| 79 | PACKAGECONFIG[enforce-alignment] = "-DFLB_ENFORCE_ALIGNMENT=Yes,-DFLB_ENFORCE_ALIGNMENT=No" | 76 | PACKAGECONFIG[enforce-alignment] = "-DFLB_ENFORCE_ALIGNMENT=Yes,-DFLB_ENFORCE_ALIGNMENT=No" |
| 80 | PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=Yes,-DFLB_EXAMPLES=No" | 77 | PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=Yes,-DFLB_EXAMPLES=No" |
| 81 | PACKAGECONFIG[http-client-debug] = "-DFLB_HTTP_CLIENT_DEBUG=Yes,-DFLB_HTTP_CLIENT_DEBUG=No" | 78 | 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" | |||
| 91 | PACKAGECONFIG[proxy-go] = "-DFLB_PROXY_GO=Yes,-DFLB_PROXY_GO=No" | 88 | PACKAGECONFIG[proxy-go] = "-DFLB_PROXY_GO=Yes,-DFLB_PROXY_GO=No" |
| 92 | PACKAGECONFIG[record-accessor] = "-DFLB_RECORD_ACCESSOR=Yes,-DFLB_RECORD_ACCESSOR=No" | 89 | PACKAGECONFIG[record-accessor] = "-DFLB_RECORD_ACCESSOR=Yes,-DFLB_RECORD_ACCESSOR=No" |
| 93 | PACKAGECONFIG[regex] = "-DFLB_REGEX=Yes,-DFLB_REGEX=No" | 90 | PACKAGECONFIG[regex] = "-DFLB_REGEX=Yes,-DFLB_REGEX=No" |
| 94 | PACKAGECONFIG[release] = "-DFLB_RELEASE=Yes,-DFLB_RELEASE=No" | ||
| 95 | PACKAGECONFIG[run-ldconfig] = "-DFLB_RUN_LDCONFIG=Yes,-DFLB_RUN_LDCONFIG=No" | 91 | PACKAGECONFIG[run-ldconfig] = "-DFLB_RUN_LDCONFIG=Yes,-DFLB_RUN_LDCONFIG=No" |
| 96 | PACKAGECONFIG[shared-lib] = "-DFLB_SHARED_LIB=Yes,-DFLB_SHARED_LIB=No" | 92 | PACKAGECONFIG[shared-lib] = "-DFLB_SHARED_LIB=Yes,-DFLB_SHARED_LIB=No" |
| 97 | PACKAGECONFIG[signv4] = "-DFLB_SIGNV4=Yes,-DFLB_SIGNV4=No" | 93 | PACKAGECONFIG[signv4] = "-DFLB_SIGNV4=Yes,-DFLB_SIGNV4=No" |
| 98 | PACKAGECONFIG[small] = "-DFLB_SMALL=Yes,-DFLB_SMALL=No" | ||
| 99 | PACKAGECONFIG[sqldb] = "-DFLB_SQLDB=Yes,-DFLB_SQLDB=No" | 94 | PACKAGECONFIG[sqldb] = "-DFLB_SQLDB=Yes,-DFLB_SQLDB=No" |
| 100 | PACKAGECONFIG[stream-processor] = "-DFLB_STREAM_PROCESSOR=Yes,-DFLB_STREAM_PROCESSOR=No" | 95 | PACKAGECONFIG[stream-processor] = "-DFLB_STREAM_PROCESSOR=Yes,-DFLB_STREAM_PROCESSOR=No" |
| 101 | PACKAGECONFIG[tests-runtime] = "-DFLB_TESTS_RUNTIME=Yes,-DFLB_TESTS_RUNTIME=No" | 96 | PACKAGECONFIG[tests-runtime] = "-DFLB_TESTS_RUNTIME=Yes,-DFLB_TESTS_RUNTIME=No" |
| @@ -119,6 +114,10 @@ SYSTEMD_SERVICE:${PN} = "fluent-bit.service" | |||
| 119 | 114 | ||
| 120 | inherit cmake systemd pkgconfig | 115 | inherit cmake systemd pkgconfig |
| 121 | 116 | ||
| 117 | # disable manipulation of compiler flags and CMAKE_BUILD_TYPE | ||
| 118 | # release and coverage are off by default, disable also debug | ||
| 119 | EXTRA_OECMAKE += "-DFLB_DEBUG=No" | ||
| 120 | |||
| 122 | FULL_OPTIMIZATION:remove = "${@'-O2' if bb.data.inherits_class('clang', d) else ''}" | 121 | FULL_OPTIMIZATION:remove = "${@'-O2' if bb.data.inherits_class('clang', d) else ''}" |
| 123 | TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}" | 122 | TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}" |
| 124 | TARGET_CC_ARCH:remove = "-D_FORTIFY_SOURCE=2" | 123 | TARGET_CC_ARCH:remove = "-D_FORTIFY_SOURCE=2" |
