Re: [meta-oe][PATCH] protobuf-c: fix race condition

From: Martin Jansa <martin.jansa@gmail.com>
To: Chen Qi <Qi.Chen@windriver.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH] protobuf-c: fix race condition
Date: Thu, 17 Oct 2019 22:44:14 +0200	[thread overview]
Message-ID: <20191017204414.GB1499@jama> (raw)
In-Reply-To: <20190929092956.13147-1-Qi.Chen@windriver.com>

[-- Attachment #1: Type: text/plain, Size: 3210 bytes --]

On Sun, Sep 29, 2019 at 05:29:56PM +0800, Chen Qi wrote:
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  .../0001-avoid-race-condition.patch           | 36 +++++++++++++++++++
>  .../protobuf/protobuf-c_1.3.2.bb              |  1 +
>  2 files changed, 37 insertions(+)
>  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

Thanks for this patch, it seems to indeed fix this issue, I've reported
a while ago:
https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg64363.html

I think the upstream would be interested in this fix as well, see:
https://github.com/protobuf-c/protobuf-c/commit/b0bb56303366e2c072ee38eb5f1f11251b07239c

Cheers,

> +
> +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.2.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.2.bb
> index 6d1ffc3f4..b92f82dec 100644
> --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.2.bb
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.2.bb
> @@ -15,6 +15,7 @@ DEPENDS = "protobuf-native protobuf"
>  SRCREV = "1390409f4ee4e26d0635310995b516eb702c3f9e"
>  
>  SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
> +           file://0001-avoid-race-condition.patch \
>            "
>  
>  S = "${WORKDIR}/git"
> -- 
> 2.17.1
> 
> -- 
> _______________________________________________
> 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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]