On Thu, Oct 17, 2019 at 03:39:46AM +0000, Sinan Kaya wrote:
> From: "Qi.Chen@windriver.com" <Qi.Chen@windriver.com>
> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> (cherry picked from commit 489d3b4b932ee8016d792341f8ea5836a9522cd4)

Yes this is needed in thud as well, but first it should be backported to
warrior as well, I'll send separate patch for that.

> ---
>  .../0001-avoid-race-condition.patch           | 36 +++++++++++++++++++
>  .../protobuf/protobuf-c_1.3.1.bb              |  3 +-
>  2 files changed, 38 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
> 
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
> new file mode 100644
> index 000000000..4fc7703d8
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
> @@ -0,0 +1,36 @@
> +From 216e31260b618ec73862f9f5336597f391444dac Mon Sep 17 00:00:00 2001
> +From: Chen Qi <Qi.Chen@windriver.com>
> +Date: Sun, 29 Sep 2019 17:20:42 +0800
> +Subject: [PATCH] avoid race condition
> +
> +It's possible that the cxx-generate-packed-data.cc is compiled
> +while the t/test-full.pb.h is being generated. This will result
> +the following error.
> +
> +  DEBUG:	./t/test-full.pb.h:4:0: error: unterminated #ifndef
> +  ./t/test-full.pb.h:4:0: error: unterminated #ifndef
> +
> +Add a dependency to avoid such problem.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> +---
> + Makefile.am | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index b0cb065..1608ae0 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -156,6 +156,7 @@ noinst_PROGRAMS += \
> + t_generated_code2_cxx_generate_packed_data_SOURCES = \
> + 	t/generated-code2/cxx-generate-packed-data.cc \
> + 	t/test-full.pb.cc
> ++t/generated-code2/cxx-generate-packed-data.cc: t/test-full.pb.h
> + $(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h
> + t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \
> + 	$(AM_CXXFLAGS) \
> +-- 
> +2.17.1
> +
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
> index 7ef030092..17f92f04b 100644
> --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
> @@ -15,7 +15,8 @@ DEPENDS = "protobuf-native protobuf"
>  PV .= "+git${SRCPV}"
>  SRCREV = "269771b4b45d3aba04e59569f53600003db8d9ff"
>  
> -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git"
> +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
> +           file://0001-avoid-race-condition.patch"
>  
>  S = "${WORKDIR}/git"
>  
> -- 
> 2.23.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com