mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
fluentbit: Upgrade 0.12.1 -> 0.12.19
Remove patch applied upstream. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-35
@@ -1,35 +0,0 @@
|
||||
From 62fa9bceb15a9d160dd5d624a6d46907c1019c5c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 8 Sep 2017 17:02:55 -0700
|
||||
Subject: [PATCH] fluent-bit-shared: Link with -lpthread
|
||||
|
||||
This fixes a reference to pthread_atfork in libfluent-bit.so
|
||||
otherwise we get undefined reference to the symbols in binaries
|
||||
which are linked with libfluent-bit.so
|
||||
|
||||
Fixes errors like
|
||||
arm-bec-linux-gnueabi-ld: ../../bin/hello_world: hidden symbol `pthread_atfork' in /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/fluentbit/0.12.1-r0/recipe-sysroot/usr/lib/libpthread_nonshared.a(pthread_atfork.oS) is referenced by DSO
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Submitted
|
||||
|
||||
src/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 425a246..1264e59 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -168,7 +168,7 @@ set(FLB_DEPS
|
||||
# Shared Library
|
||||
if(NOT FLB_WITHOUT_SHARED_LIB)
|
||||
add_library(fluent-bit-shared SHARED ${src})
|
||||
- target_link_libraries(fluent-bit-shared ${FLB_DEPS})
|
||||
+ target_link_libraries(fluent-bit-shared ${FLB_DEPS} -lpthread)
|
||||
set_target_properties(fluent-bit-shared
|
||||
PROPERTIES OUTPUT_NAME fluent-bit)
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
+2
-3
@@ -4,10 +4,9 @@ BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
|
||||
|
||||
SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \
|
||||
file://jemalloc.patch \
|
||||
file://0001-fluent-bit-shared-Link-with-lpthread.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "6b4472cb7e7213a01425af9121576827"
|
||||
SRC_URI[sha256sum] = "8ec05365baea723033165687611b3bba3e67a77dce72e282e9f000f7acf9e37b"
|
||||
SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34"
|
||||
SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241"
|
||||
|
||||
S = "${WORKDIR}/fluent-bit-${PV}"
|
||||
|
||||
Reference in New Issue
Block a user