mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-02 13:59:59 +00:00
protobuf-c: fix race condition
Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
7e5be41e9e
commit
489d3b4b93
@@ -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
|
||||||
|
|
||||||
@@ -15,6 +15,7 @@ DEPENDS = "protobuf-native protobuf"
|
|||||||
SRCREV = "1390409f4ee4e26d0635310995b516eb702c3f9e"
|
SRCREV = "1390409f4ee4e26d0635310995b516eb702c3f9e"
|
||||||
|
|
||||||
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"
|
S = "${WORKDIR}/git"
|
||||||
|
|||||||
Reference in New Issue
Block a user