MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-18 08:15:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fluentbit: Upgrade to 1.9.7 and fix build on x86

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-08-18 23:39:31 -07:00
parent 6c998191cd
commit d1fb6cd8a5
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta-oe/recipes-extended/fluentbit/fluentbit/0001-Revert-Remove-unused-variable-in-mpi_mul_hlp.patch Normal file
View File

@ -0,0 +1,42 @@
From af6cefba8c2675f58b75f93785337ab23054568c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 18 Aug 2022 23:35:23 -0700
Subject: [PATCH] Revert Remove unused variable in mpi_mul_hlp()
This reverts
https://github.com/Mbed-TLS/mbedtls/commit/e7f14a3090e6595eb3c8d821704ad9c90f6d3712
Which helps in compiling the x86 asm code.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/mbedtls-2.28.0/library/bignum.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/mbedtls-2.28.0/library/bignum.c b/lib/mbedtls-2.28.0/library/bignum.c
index 9c256ae..62e7f76 100644
--- a/lib/mbedtls-2.28.0/library/bignum.c
+++ b/lib/mbedtls-2.28.0/library/bignum.c
@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i,
mbedtls_mpi_uint *d,
mbedtls_mpi_uint b )
{
- mbedtls_mpi_uint c = 0;
+ mbedtls_mpi_uint c = 0, t = 0;
#if defined(MULADDC_HUIT)
for( ; i >= 8; i -= 8 )
@@ -1443,6 +1443,8 @@ void mpi_mul_hlp( size_t i,
}
#endif /* MULADDC_HUIT */
+ t++;
+
while( c != 0 )
{
*d += c; c = ( *d < c ); d++;
--
2.37.2

7
meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb → meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
View File

@ -22,13 +22,13 @@ SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-b
file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \ file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \
file://0005-stackdriver-Fix-return-type-mismatch.patch \ file://0005-stackdriver-Fix-return-type-mismatch.patch \
file://0006-monkey-Fix-TLS-detection-testcase.patch \ file://0006-monkey-Fix-TLS-detection-testcase.patch \
file://0001-Revert-Remove-unused-variable-in-mpi_mul_hlp.patch \
" "
SRC_URI:append:libc-musl = "\ 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] = "5ef7dd97e10936269fe5f4e5d3ebf16559333066f7d6757ba12464a9d6186570" SRC_URI[sha256sum] = "8ca2ac081d7eee717483c06608adcb5e3d5373e182ad87dba21a23f8278c6540"
S = "${WORKDIR}/fluent-bit-${PV}" S = "${WORKDIR}/fluent-bit-${PV}"
DEPENDS = "zlib bison-native flex-native openssl" DEPENDS = "zlib bison-native flex-native openssl"
@ -78,6 +78,9 @@ EXTRA_OECMAKE:append:libc-musl = ' -DFLB_JEMALLOC_OPTIONS="--with-jemalloc-prefi
EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2"
inherit cmake systemd pkgconfig inherit cmake systemd pkgconfig