From patchwork Fri Jun 30 12:59:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 106700 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2304174qge; Fri, 30 Jun 2017 06:02:01 -0700 (PDT) X-Received: by 10.99.3.216 with SMTP id 207mr20860726pgd.161.1498827721727; Fri, 30 Jun 2017 06:02:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498827721; cv=none; d=google.com; s=arc-20160816; b=AkHFqMnVTqjyVgeHp1yEB0kT341u9a/WXzQZQL9t07gtfK6cJzSjz1b6a/0upZHc4q h/+rmyjVFzfp8dnmU+OVrSmu6XsNElIMKXCtIiN9Gn0ergPUo4Zj3q1+LhV6AFooTLUX umd0vlSyQUUBMwW7wspBto/t+lnAz2UCLHb3390aih+U5Ws2JrVn0vLW91Ab4YpHnv+D o5aIhKcN7o7EDII+WeOVIqd2GCZT9OzkCrsUeCTy7DgFnbh3YM/phuhavKhMDJSAljU/ XbUWPPvDg/otbA80rmH7WxiYFFbQxmaUK7659sgzJV8hFh/9qVuQzS43S4k9ue2zsfIl Wmjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=HUDn7suRiMhVOPBtGaOWQHdfrXrOQ53+OjnvNi/kYd4=; b=ABjmAMmtXKG7VsqANyrpqZF6bvovY3l1VHUA4LIL1zkz7JfeAdfnbc0QtipbYdi72R TNIi3uS8JR0A9ENVnEKbbomeDZhfWQcaDYmc6N1j1qgSYdtUsjFHMXR4bL755xRrL6Nn m80yQACxaiT/YtfVFSq15bw8gQeNy3G/J25xYJOUITrRY0f4kzdEC6S0dTrW6D2/yX6J CdRqnUWKEPbdRdv465ue/VLbJRdVtqTlJEkyCThAum5JrZTfczEiCPFG2B5Env0v63mg GS9oYSsca8ybltgg6xG5nWSN25pbtDsLNrSNpQkKTTN5mjaoc+zHRjrOIKs4IEwH8REV jWGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=B3+ggh+e; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l187si5533108pge.517.2017.06.30.06.02.01; Fri, 30 Jun 2017 06:02:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=B3+ggh+e; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5570C782B4; Fri, 30 Jun 2017 13:01:07 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id 4C01778268 for ; Fri, 30 Jun 2017 13:00:21 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id e199so17016681pfh.0 for ; Fri, 30 Jun 2017 06:00:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fJ15d+kdzb5K4yqVkvyoTMsabkyRKaaccjghzyL7uGk=; b=B3+ggh+eCDZlQcs8W/M5W150faP/kk5a2rcuH0CdgkwTnquOn3I2LNHxSO3LgMqFbc D0X2iEJwB+WqnESJTUQvsmS9UHQB+H2OHPzbrdy3qycyv4+6guuZfRzAh+zBjKfcEGHV WckjS7poHrRZJVAscoBQ89Js7CMMwEBRxKegIsRIECex9c5GjecYJxk6M5u3VTMjb8wy 8ROrh6MprT4EMBeEpAc9iRG1n1OWRsIblqZitwWvq3WzfFYAxuveEv77OyAp795a9rFx RH5vNVu8vCsrLJ3k3iQv7XNSxIwuur0rGOKvNdW9kiXwdpOKevvOY3CxrsWGmYYNGfdu E4Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fJ15d+kdzb5K4yqVkvyoTMsabkyRKaaccjghzyL7uGk=; b=esBDh2yFCL/QrSKnY9TLIHuL0gAMCEVKFPCRNC9WJTPJMQU+HCa4xag5J1+1hVrJv3 nyf7vv0cTvYNua83MaXexm/SZtuw1iATwI2huSqgrXa/XADsmFbcQeYoD8fZukE4iXrU jBhctPkR8hAQgClBD7wGnssliksqzaOJUB0fHvBmLWZ9bkMIoprYN0MbZejT25GzYLBL 7GzBbc5rh9782ZV6JBrQX31x21TytN3QinzT0ThRfyr+ILCPnvwD7pr977tN1hUtE2yL 8/5JQf9+sZCxOyivjuYtW6rmM26tyQuEy/qxtNSUatQPRBgLXxH+lqKYG1cyD/kpTBH/ LRCA== X-Gm-Message-State: AKS2vOy/dPeFIkS/JeftHSc0RD7fupHoUEbFPfUogYw9BpPPBmKcjXow qQtSUSbgXLV3RKlp X-Received: by 10.101.73.11 with SMTP id p11mr20796460pgs.234.1498827622919; Fri, 30 Jun 2017 06:00:22 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::3df3]) by smtp.gmail.com with ESMTPSA id t26sm10735590pfl.41.2017.06.30.06.00.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 06:00:22 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 30 Jun 2017 05:59:48 -0700 Message-Id: <20170630125957.3342-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170630125957.3342-1-raj.khem@gmail.com> References: <20170630125957.3342-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 08/17] fluentbit: Fix parallel build race X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org 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 | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Khem Raj --- ...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 -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel 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 +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 +--- + 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}"