From 12b27e51290a35b30945cea519acfef8dff3fc14 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Fri, 15 Oct 2021 00:14:19 +0200 Subject: protobuf-c: update to 1.4.0 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../protobuf-c/0001-avoid-race-condition.patch | 36 --------------------- .../recipes-devtools/protobuf/protobuf-c_1.3.3.bb | 37 ---------------------- .../recipes-devtools/protobuf/protobuf-c_1.4.0.bb | 34 ++++++++++++++++++++ 3 files changed, 34 insertions(+), 73 deletions(-) delete mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch delete mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb create mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb (limited to 'meta-oe') 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 deleted file mode 100644 index 4fc7703d81..0000000000 --- a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 216e31260b618ec73862f9f5336597f391444dac Mon Sep 17 00:00:00 2001 -From: Chen Qi -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 ---- - 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.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb deleted file mode 100644 index 1a0bf535c9..0000000000 --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Protocol Buffers - structured data serialisation mechanism" -DESCRIPTION = "This is protobuf-c, a C implementation of the Google Protocol Buffers data \ -serialization format. It includes libprotobuf-c, a pure C library that \ -implements protobuf encoding and decoding, and protoc-c, a code generator that \ -converts Protocol Buffer .proto files to C descriptor code, based on the \ -original protoc. protobuf-c formerly included an RPC implementation; that code \ -has been split out into the protobuf-c-rpc project." -HOMEPAGE = "https://github.com/protobuf-c/protobuf-c" -SECTION = "console/tools" -LICENSE = "BSD-2-Clause" -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 \ - " - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -# After several fix attempts there is still a race between generating -# t.test-full.pb.h and compiling cxx_generate_packed_data.c despite -# BUILT_SOURCES and explicit dependencies. -PARALLEL_MAKE = "" - -PACKAGE_BEFORE_PN = "${PN}-compiler" - -FILES:${PN}-compiler = "${bindir}" - -RDEPENDS:${PN}-compiler = "protobuf-compiler" -RDEPENDS:${PN}-dev += "${PN}-compiler" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb new file mode 100644 index 0000000000..cc037d3934 --- /dev/null +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb @@ -0,0 +1,34 @@ +SUMMARY = "Protocol Buffers - structured data serialisation mechanism" +DESCRIPTION = "This is protobuf-c, a C implementation of the Google Protocol Buffers data \ +serialization format. It includes libprotobuf-c, a pure C library that \ +implements protobuf encoding and decoding, and protoc-c, a code generator that \ +converts Protocol Buffer .proto files to C descriptor code, based on the \ +original protoc. protobuf-c formerly included an RPC implementation; that code \ +has been split out into the protobuf-c-rpc project." +HOMEPAGE = "https://github.com/protobuf-c/protobuf-c" +SECTION = "console/tools" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558" + +DEPENDS = "protobuf-native protobuf" + +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git" +SRCREV = "f224ab2eeb648a818eb20687d7150a285442c907" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +# After several fix attempts there is still a race between generating +# t.test-full.pb.h and compiling cxx_generate_packed_data.c despite +# BUILT_SOURCES and explicit dependencies. +PARALLEL_MAKE = "" + +PACKAGE_BEFORE_PN = "${PN}-compiler" + +FILES:${PN}-compiler = "${bindir}" + +RDEPENDS:${PN}-compiler = "protobuf-compiler" +RDEPENDS:${PN}-dev += "${PN}-compiler" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf