Drop upstreamed patches Fix jemalloc build with musl Signed-off-by: Khem Raj <[email protected]> --- ...proxy-go-Add-missing-dependency-on-jemall.patch | 24 ------------------- ...pack-Add-comment-for-intended-fallthrough.patch | 28 ---------------------- .../fluentbit/fluentbit/jemalloc.patch | 18 ++++++++++++++ .../{fluentbit_0.11.11.bb => fluentbit_0.12.1.bb} | 9 ++++--- 4 files changed, 22 insertions(+), 57 deletions(-) delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-flb-plugin-proxy-go-Add-missing-dependency-on-jemall.patch delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch rename meta-oe/recipes-extended/fluentbit/{fluentbit_0.11.11.bb => fluentbit_0.12.1.bb} (59%)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-flb-plugin-proxy-go-Add-missing-dependency-on-jemall.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-flb-plugin-proxy-go-Add-missing-dependency-on-jemall.patch deleted file mode 100644 index 90242aeb6..000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-flb-plugin-proxy-go-Add-missing-dependency-on-jemall.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 84d70b6bc744cd348e66a0bc6c7958cdfa9ce670 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 29 Jun 2017 12:56:21 -0700 -Subject: [PATCH] flb-plugin-proxy-go: Add missing dependency on jemalloc - -Signed-off-by: Khem Raj <[email protected]> ---- - src/proxy/go/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/proxy/go/CMakeLists.txt b/src/proxy/go/CMakeLists.txt -index 3273346..02a54c2 100644 ---- a/src/proxy/go/CMakeLists.txt -+++ b/src/proxy/go/CMakeLists.txt -@@ -2,3 +2,6 @@ set(src - go.c) - - add_library(flb-plugin-proxy-go STATIC ${src}) -+if(FLB_JEMALLOC) -+ target_link_libraries(flb-plugin-proxy-go libjemalloc) -+endif() --- -2.13.2 - diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch deleted file mode 100644 index 35cdb18ad..000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d95c2977da074be0d3913e94fb8fb5ed1c64404a Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 <[email protected]> ---- - 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 - diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch new file mode 100644 index 000000000..abaf92c05 --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch @@ -0,0 +1,18 @@ +Add --with-jemalloc-prefix=je_ so it compiles on musl + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Pending + +Index: fluent-bit-0.12.1/CMakeLists.txt +=================================================================== +--- fluent-bit-0.12.1.orig/CMakeLists.txt ++++ fluent-bit-0.12.1/CMakeLists.txt +@@ -325,7 +325,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} + # 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 ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> ++ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-jemalloc-prefix=je_ ${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}/ diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.11.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb similarity index 59% rename from meta-oe/recipes-extended/fluentbit/fluentbit_0.11.11.bb rename to meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb index 521d00bf6..10878dcd6 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.11.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb @@ -2,12 +2,11 @@ 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-flb-plugin-proxy-go-Add-missing-dependency-on-jemall.patch \ - file://0002-msgpack-Add-comment-for-intended-fallthrough.patch \ +SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \ + file://jemalloc.patch \ " -SRC_URI[md5sum] = "7bce8091c41fb6412b7fe0185b3cb8d6" -SRC_URI[sha256sum] = "93b1bdd14db20f2823cd31c6f1a2f3fcb7c94ec3e0c8daefabf130310b7fc4ed" +SRC_URI[md5sum] = "6b4472cb7e7213a01425af9121576827" +SRC_URI[sha256sum] = "8ec05365baea723033165687611b3bba3e67a77dce72e282e9f000f7acf9e37b" S = "${WORKDIR}/fluent-bit-${PV}" -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
