mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
fluentbit: Upgrade to 0.11.3 release
Fix cross compiling for external modules Fix build with gcc7 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
Martin Jansa
parent
cc275f0b11
commit
68c22d5bf1
|
|
@ -0,0 +1,52 @@
|
|||
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
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From d95c2977da074be0d3913e94fb8fb5ed1c64404a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 22 Apr 2017 10:04:03 -0700
|
||||
Subject: [PATCH 2/2] msgpack: Add comment for intended fallthrough
|
||||
|
||||
Helps fixing build with gcc7
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h b/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h
|
||||
index a6dae6f..651e6c2 100644
|
||||
--- a/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h
|
||||
+++ b/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h
|
||||
@@ -248,7 +248,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
|
||||
|
||||
_fixed_trail_again:
|
||||
++p;
|
||||
-
|
||||
+ // fallthrough
|
||||
default:
|
||||
if((size_t)(pe - p) < trail) { goto _out; }
|
||||
n = p; p += trail - 1;
|
||||
--
|
||||
2.12.2
|
||||
|
||||
24
meta-oe/recipes-extended/fluentbit/fluentbit_0.11.3.bb
Normal file
24
meta-oe/recipes-extended/fluentbit/fluentbit_0.11.3.bb
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
SUMMARY = "Fast data collector for Embedded Linux"
|
||||
HOMEPAGE = "http://fluentbit.io"
|
||||
BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
|
||||
|
||||
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 \
|
||||
"
|
||||
SRC_URI[md5sum] = "9383262339412782b80cc49e7ad15609"
|
||||
SRC_URI[sha256sum] = "eb8a85c656fa60682b0bf8dd1ad58d848cd251dab4f35a6777acd552c65b0511"
|
||||
|
||||
S = "${WORKDIR}/fluent-bit-${PV}"
|
||||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
|
||||
|
||||
DEPENDS = "zlib"
|
||||
INSANE_SKIP_${PN}-dev += "dev-elf"
|
||||
|
||||
inherit cmake systemd
|
||||
|
||||
EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS}"
|
||||
|
||||
SYSTEMD_SERVICE_${PN} = "fluent-bit.service"
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
SUMMARY = "Fast data collector for Embedded Linux"
|
||||
HOMEPAGE = "http://fluentbit.io"
|
||||
BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
|
||||
|
||||
SRC_URI = "http://fluentbit.io/releases/0.7/fluent-bit-${PV}.tar.gz"
|
||||
SRC_URI[md5sum] = "6df9d676e1d2d782a243e655e144e8ae"
|
||||
SRC_URI[sha256sum] = "695b56ce378f56855c9554f88f5d8e4f7b11ba7691284903870f779912af4ebe"
|
||||
S = "${WORKDIR}/fluent-bit-${PV}"
|
||||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
|
||||
|
||||
DEPENDS = "zlib"
|
||||
INSANE_SKIP_${PN}-dev += "dev-elf"
|
||||
|
||||
inherit cmake
|
||||
Loading…
Reference in New Issue
Block a user