mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 02:10:04 +00:00
protobuf-c: update to 1.4.0
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
6bbc8b2d3a
commit
12b27e5129
@@ -1,36 +0,0 @@
|
||||
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
|
||||
|
||||
+2
-5
@@ -12,11 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558"
|
||||
|
||||
DEPENDS = "protobuf-native protobuf"
|
||||
|
||||
SRCREV = "f20a3fa131c275a0e795d99a28f94b4dbbb5af26"
|
||||
|
||||
SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
|
||||
file://0001-avoid-race-condition.patch \
|
||||
"
|
||||
SRC_URI = "git://github.com/protobuf-c/protobuf-c.git"
|
||||
SRCREV = "f224ab2eeb648a818eb20687d7150a285442c907"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user