mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-01 13:40:04 +00:00
protobuf: Upgrade 3.11.4 -> 3.12.3
Upgrade to release 3.12.3. Update the path to the git repository in GitHub. Update the patch for examples/Makefile. The new release brings: - [experimental] Singular, non-message typed fields in proto3 now support presence tracking. This is enabled by adding the "optional" field label and passing the --experimental_allow_proto3_optional flag to protoc. - Allow duplicate symbol names when multiple descriptor sets are passed on the command-line, to match the behavior when multiple .proto files are passed. - Deterministic protoc --descriptor_set_out - Bug fixes for the supported programming languages Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+8
-4
@@ -1,4 +1,4 @@
|
||||
From a28e15092a298e0c73c6fc1ded0913275cf27cb0 Mon Sep 17 00:00:00 2001
|
||||
From e5340f816aa273cfda36998466739ca0748caafb Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Fri, 28 Jun 2019 13:50:52 +0000
|
||||
Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build
|
||||
@@ -23,12 +23,13 @@ Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
|
||||
---
|
||||
examples/Makefile | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/examples/Makefile b/examples/Makefile
|
||||
index 4ad605641..31d887639 100644
|
||||
index e9f9635ae..b2fbe2de1 100644
|
||||
--- a/examples/Makefile
|
||||
+++ b/examples/Makefile
|
||||
@@ -2,6 +2,8 @@
|
||||
@@ -44,13 +45,16 @@ index 4ad605641..31d887639 100644
|
||||
|
||||
add_person_cpp: add_person.cc protoc_middleman
|
||||
pkg-config --cflags protobuf # fails if protobuf is not installed
|
||||
- c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
|
||||
- c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
|
||||
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
|
||||
|
||||
list_people_cpp: list_people.cc protoc_middleman
|
||||
pkg-config --cflags protobuf # fails if protobuf is not installed
|
||||
- c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
|
||||
- c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
|
||||
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
|
||||
|
||||
add_person_dart: add_person.dart protoc_middleman_dart
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
||||
+2
-2
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
|
||||
DEPENDS = "zlib"
|
||||
DEPENDS_append_class-target = " protobuf-native"
|
||||
|
||||
SRCREV = "d0bfd5221182da1a7cc280f3337b5e41a89539cf"
|
||||
SRCREV = "31ebe2ac71400344a5db91ffc13c4ddfb7589f92"
|
||||
|
||||
SRC_URI = "git://github.com/google/protobuf.git;branch=3.11.x \
|
||||
SRC_URI = "git://github.com/protocolbuffers/protobuf.git \
|
||||
file://run-ptest \
|
||||
file://0001-protobuf-fix-configure-error.patch \
|
||||
file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \
|
||||
Reference in New Issue
Block a user