mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
fluentbit: Upgrade to 0.11.11
Drop upstreamed patch Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
-52
@@ -1,52 +0,0 @@
|
|||||||
From ceb47f37582a055bb7f253f813c435ad55c5b6eb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sat, 22 Apr 2017 10:02:50 -0700
|
|
||||||
Subject: [PATCH 1/2] CMakeLists.txt: Add AUTOCONF_HOST_OPT to help cross
|
|
||||||
compiling
|
|
||||||
|
|
||||||
This helps in doing cross compiles for modules which are using
|
|
||||||
GNU autoconf for build system
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 10 ++++++++--
|
|
||||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index b093f9a..ebf0cd7 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -290,6 +290,12 @@ else()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
+if("${GNU_HOST}" STREQUAL "")
|
|
||||||
+ set(AUTOCONF_HOST_OPT "")
|
|
||||||
+else()
|
|
||||||
+ set(AUTOCONF_HOST_OPT "--host=${GNU_HOST}")
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
# Memory Allocator
|
|
||||||
# ================
|
|
||||||
if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
||||||
@@ -299,7 +305,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
||||||
# Link to Jemalloc as an external dependency
|
|
||||||
ExternalProject_Add(jemalloc
|
|
||||||
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc
|
|
||||||
- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR>
|
|
||||||
+ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR>
|
|
||||||
CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops
|
|
||||||
BUILD_COMMAND ${MAKE}
|
|
||||||
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/
|
|
||||||
@@ -317,7 +323,7 @@ endif()
|
|
||||||
if(FLB_REGEX)
|
|
||||||
ExternalProject_Add(onigmo
|
|
||||||
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/onigmo
|
|
||||||
- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/onigmo/configure --with-pic --disable-shared --enable-static --prefix=<INSTALL_DIR>
|
|
||||||
+ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/onigmo/configure ${AUTOCONF_HOST_OPT} --with-pic --disable-shared --enable-static --prefix=<INSTALL_DIR>
|
|
||||||
CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops
|
|
||||||
BUILD_COMMAND ${MAKE}
|
|
||||||
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/
|
|
||||||
--
|
|
||||||
2.12.2
|
|
||||||
|
|
||||||
+3
-4
@@ -3,11 +3,10 @@ HOMEPAGE = "http://fluentbit.io"
|
|||||||
BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
|
BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
|
||||||
|
|
||||||
SRC_URI = "http://fluentbit.io/releases/0.11/fluent-bit-${PV}.tar.gz \
|
SRC_URI = "http://fluentbit.io/releases/0.11/fluent-bit-${PV}.tar.gz \
|
||||||
file://0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch \
|
|
||||||
file://0002-msgpack-Add-comment-for-intended-fallthrough.patch \
|
file://0002-msgpack-Add-comment-for-intended-fallthrough.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "9383262339412782b80cc49e7ad15609"
|
SRC_URI[md5sum] = "7bce8091c41fb6412b7fe0185b3cb8d6"
|
||||||
SRC_URI[sha256sum] = "eb8a85c656fa60682b0bf8dd1ad58d848cd251dab4f35a6777acd552c65b0511"
|
SRC_URI[sha256sum] = "93b1bdd14db20f2823cd31c6f1a2f3fcb7c94ec3e0c8daefabf130310b7fc4ed"
|
||||||
|
|
||||||
S = "${WORKDIR}/fluent-bit-${PV}"
|
S = "${WORKDIR}/fluent-bit-${PV}"
|
||||||
|
|
||||||
@@ -19,6 +18,6 @@ INSANE_SKIP_${PN}-dev += "dev-elf"
|
|||||||
|
|
||||||
inherit cmake systemd
|
inherit cmake systemd
|
||||||
|
|
||||||
EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS}"
|
EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1"
|
||||||
|
|
||||||
SYSTEMD_SERVICE_${PN} = "fluent-bit.service"
|
SYSTEMD_SERVICE_${PN} = "fluent-bit.service"
|
||||||
Reference in New Issue
Block a user