Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][PATCH 08/17] fluentbit: Fix parallel build race
Date: Fri, 30 Jun 2017 05:59:48 -0700	[thread overview]
Message-ID: <20170630125957.3342-8-raj.khem@gmail.com> (raw)
In-Reply-To: <20170630125957.3342-1-raj.khem@gmail.com>

Sometimes with high parallism the build fails like below

| In file included from /mnt/a/oe/workspace/sources/fluentbit/include/fluent-bit/flb_thread_libco.h:24:0,
|                  from /mnt/a/oe/workspace/sources/fluentbit/include/fluent-bit/flb_thread.h:41,
|                  from /mnt/a/oe/workspace/sources/fluentbit/include/fluent-bit/flb_io.h:26,
|                  from /mnt/a/oe/workspace/sources/fluentbit/include/fluent-bit/flb_output.h:34,
|                  from /mnt/a/oe/workspace/sources/fluentbit/include/fluent-bit/flb_plugin_proxy.h:25,
|                  from /mnt/a/oe/workspace/sources/fluentbit/src/proxy/go/go.c:22:
| /mnt/a/oe/workspace/sources/fluentbit/include/fluent-bit/flb_mem.h:31:10: fatal error: jemalloc/jemalloc.h: No such file or directory
|  #include <jemalloc/jemalloc.h>
|           ^~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...proxy-go-Add-missing-dependency-on-jemall.patch | 24 ++++++++++++++++++++++
 .../fluentbit/fluentbit_0.11.11.bb                 |  3 +++
 2 files changed, 27 insertions(+)
 create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-flb-plugin-proxy-go-Add-missing-dependency-on-jemall.patch

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
new file mode 100644
index 000000000..90242aeb6
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-flb-plugin-proxy-go-Add-missing-dependency-on-jemall.patch
@@ -0,0 +1,24 @@
+From 84d70b6bc744cd348e66a0bc6c7958cdfa9ce670 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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_0.11.11.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.11.bb
index 46c47fd55..83818c84d 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.11.bb
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.11.bb
@@ -3,6 +3,7 @@ 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[md5sum] = "7bce8091c41fb6412b7fe0185b3cb8d6"
@@ -21,3 +22,5 @@ inherit cmake systemd
 EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1"
 
 SYSTEMD_SERVICE_${PN} = "fluent-bit.service"
+
+TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}"
-- 
2.13.2



  parent reply	other threads:[~2017-06-30 13:00 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-30 12:59 [meta-networking][PATCH 01/17] autofs: Add build dependency on libnsl2 Khem Raj
2017-06-30 12:59 ` [meta-multimedia][PATCH 02/17] gst-plugins-gl_0.10.3.bb: Fix build on rpi/userland Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 03/17] librcf: fix mips/mips64 build Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 04/17] freerdp: Fix build on mips Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 05/17] gegl: Upgrade to 0.3.18 Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 06/17] babl: Upgrade to 0.1.28 Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 07/17] gimp: Upgrade to 2.8.22 Khem Raj
2017-06-30 12:59 ` Khem Raj [this message]
2017-06-30 12:59 ` [meta-oe][PATCH 09/17] dietsplash: Fix build on mips Khem Raj
2017-06-30 12:59 ` [meta-multimedia][PATCH 10/17] libsrtp: " Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 11/17] assimp: Upgrade to 3.3.1 release Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 12/17] synergy: Update to 1.8.8 release Khem Raj
2017-06-30 12:59 ` [meta-multimedia][PATCH 13/17] kodi: Update to 17.3 Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 14/17] libtorrent: Implement 64bit atomics for mips32 Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 15/17] rtorrent: Add and enable ipv6 packageconfig based on DISTRO_FEATURES Khem Raj
2017-06-30 12:59 ` [meta-oe][PATCH 16/17] uim: Add support for aarch64 Khem Raj
2017-06-30 12:59 ` [meta-networking][PATCH 17/17] openhpi: Fix build on 64bit platforms e.g. aarch64 Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170630125957.3342-8-raj.khem@gmail.com \
    --to=raj.khem@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox