CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

protobuf-c: fix race condition

Browse Source 
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 489d3b4b93)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Qi.Chen@windriver.com 2019-10-17 20:45:24 +00:00 committed by Armin Kuster
parent b0478316a1
commit 7f011d0ba2
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch Normal file
View File

@ -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

3
meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
View File

@ -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"