Skip to contentSkip to conversation

protobuf: 3.6.1 -> 3.8.0

PATCH In review Pascal Bach 2 participants 6 messages Jun 17, 2019 – Jun 27, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/3 protobuf: 3.6.1 -> 3.8.0

Simple update to latest release

The patch is needed to make python3-protobuf compile as otherwise a file it expects is missing.

---
 ...s-map_util.h-to-list-of-installed-headers.patch | 52 ++++++++++++++++++++++
 .../{protobuf_3.6.1.bb => protobuf_3.8.0.bb}       |  7 ++-
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch
 rename meta-oe/recipes-devtools/protobuf/{protobuf_3.6.1.bb => protobuf_3.8.0.bb} (93%)
meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +52 -0
new file mode 100644
index 000000000..a160e5e97
@@ -0,0 +1,52 @@
+From ea6e776e50971c89ad2293046b6ae2a6a9753c56 Mon Sep 17 00:00:00 2001
+From: Adam Cozzette <[email protected]>
+Date: Thu, 6 Jun 2019 10:29:58 -0700
+Subject: [PATCH] Added stubs/map_util.h to list of installed headers
+
+This should fix issue #6186. I also had to remove a couple unnecessary
+const keywords in map_util.h because the no_warning_test was showing
+errors about those.
+
+Upstream-Status: Submitted [https://github.com/protocolbuffers/protobuf/pull/6223]
+---
+ src/Makefile.am                      | 1 +
+ src/google/protobuf/stubs/map_util.h | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index be18ba76..1689e221 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -72,6 +72,7 @@ nobase_include_HEADERS =                                         \
+   google/protobuf/stubs/hash.h                                   \
+   google/protobuf/stubs/logging.h                                \
+   google/protobuf/stubs/macros.h                                 \
++  google/protobuf/stubs/map_util.h                               \
+   google/protobuf/stubs/mutex.h                                  \
+   google/protobuf/stubs/once.h                                   \
+   google/protobuf/stubs/platform_macros.h                        \
+diff --git a/src/google/protobuf/stubs/map_util.h b/src/google/protobuf/stubs/map_util.h
+index 2313e1f5..b04d9d46 100644
+--- a/src/google/protobuf/stubs/map_util.h
++++ b/src/google/protobuf/stubs/map_util.h
+@@ -620,7 +620,7 @@ bool UpdateReturnCopy(Collection* const collection,
+ // twice. Unlike UpdateReturnCopy this also does not come with the issue of an
+ // undefined previous* in case new data was inserted.
+ template <class Collection>
+-typename Collection::value_type::second_type* const
++typename Collection::value_type::second_type*
+ InsertOrReturnExisting(Collection* const collection,
+                        const typename Collection::value_type& vt) {
+   std::pair<typename Collection::iterator, bool> ret = collection->insert(vt);
+@@ -633,7 +633,7 @@ InsertOrReturnExisting(Collection* const collection,
+
+ // Same as above, except for explicit key and data.
+ template <class Collection>
+-typename Collection::value_type::second_type* const
++typename Collection::value_type::second_type*
+ InsertOrReturnExisting(
+     Collection* const collection,
+     const typename Collection::value_type::first_type& key,
+--
+2.11.0
+
meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb renamed from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb +3 -4
similarity index 93%
rename from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb
index cf72d9ca7..476d1e309 100644
@@ -10,13 +10,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
 DEPENDS = "zlib"
 DEPENDS_append_class-target = " protobuf-native"
 
-PV .= "+git${SRCPV}"
+SRCREV = "09745575a923640154bcf307fba8aedff47f240a"
 
-SRCREV = "48cb18e5c419ddd23d9badcfe4e9df7bde1979b2"
-
-SRC_URI = "git://github.com/google/protobuf.git;branch=3.6.x \
+SRC_URI = "git://github.com/google/protobuf.git;branch=3.8.x \
            file://run-ptest \
            file://0001-protobuf-fix-configure-error.patch \
+           file://0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch \
 "
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.11.0
#1 lore raw

PATCH v4 2/3 protobuf-c: add patch for protobuf 3 compatibility

There is no release yet of protobuf-c that is compatible with protobuf 3. Master is already patched so this is just a straight backport of this patch.

---
 .../protobuf-c/protobuf3-compatibility.patch       | 55 ++++++++++++++++++++++
 .../recipes-devtools/protobuf/protobuf-c_1.3.1.bb  |  4 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf3-compatibility.patch
meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf3-compatibility.patch new file +55 -0
new file mode 100644
index 000000000..35914952d
@@ -0,0 +1,55 @@
+From 7456d1621223d425b8a3fd74e435a79c046169fb Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <[email protected]>
+Date: Wed, 10 Apr 2019 20:47:48 -0400
+Subject: [PATCH] t/generated-code2/cxx-generate-packed-data.cc: Fix build
+ failure on newer protobuf
+
+ Upstream-Status: Backport [https://github.com/protobuf-c/protobuf-c/pull/369]
+
+google::protobuf::Message::Reflection has been removed in newer versions
+of protobuf. The replacement is google::protobuf::Reflection.
+
+protobuf in commit 779f61c6a3ce02a119e28e802f229e61b69b9046 ("Integrate
+recent changes from google3.", from August 2008) changed the following
+in message.h:
+
+    @@ -336,7 +337,8 @@ class LIBPROTOBUF_EXPORT Message {
+
+       // Introspection ---------------------------------------------------
+
+    -  class Reflection;  // Defined below.
+    +  // Typedef for backwards-compatibility.
+    +  typedef google::protobuf::Reflection Reflection;
+
+The "typedef for backwards-compatibility" apparently lasted ten years
+until protobuf commit 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3
+("Down-integrate from google3.", from August 2018) which finally removed
+the typedef:
+
+    @@ -327,8 +344,6 @@ class LIBPROTOBUF_EXPORT Message : public MessageLite {
+
+       // Introspection ---------------------------------------------------
+
+    -  // Typedef for backwards-compatibility.
+    -  typedef google::protobuf::Reflection Reflection;
+
+This commit updates the only use of this typedef (in the test suite) to
+directly refer to the replacement, google::protobuf::Reflection. This
+fixes the build failure in the test suite.
+---
+ t/generated-code2/cxx-generate-packed-data.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/generated-code2/cxx-generate-packed-data.cc b/t/generated-code2/cxx-generate-packed-data.cc
+index 4fd3e25..0865d2e 100644
+--- a/t/generated-code2/cxx-generate-packed-data.cc
++++ b/t/generated-code2/cxx-generate-packed-data.cc
+@@ -998,7 +998,7 @@ static void dump_test_packed_repeated_enum (void)
+ static void dump_test_unknown_fields (void)
+ {
+   EmptyMess mess;
+-  const google::protobuf::Message::Reflection *reflection = mess.GetReflection();
++  const google::protobuf::Reflection *reflection = mess.GetReflection();
+   google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess);
+
+ #if GOOGLE_PROTOBUF_VERSION >= 2001000
meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb +3 -1
index 7ef030092..1d1782306 100644
@@ -15,7 +15,9 @@ 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://protobuf3-compatibility.patch \
+          "
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.11.0
#2 lore raw

PATCH v4 3/3 python3-protobuf, python-protobuf: 3.6.1 -> 3.8.0

In reply to Pascal Bach

The patch for Python 3.7 compatibility is already in 3.8.0.

---
 .../recipes-devtools/python/python-protobuf.inc    |  4 +-
 ...-protobuf_3.6.1.bb => python-protobuf_3.8.0.bb} |  0
 .../0001-Add-Python-3.7-compatibility-4862.patch   | 98 ----------------------
 ...protobuf_3.6.1.bb => python3-protobuf_3.8.0.bb} |  1 -
 4 files changed, 2 insertions(+), 101 deletions(-)
 rename meta-python/recipes-devtools/python/{python-protobuf_3.6.1.bb => python-protobuf_3.8.0.bb} (100%)
 delete mode 100644 meta-python/recipes-devtools/python/python3-protobuf/0001-Add-Python-3.7-compatibility-4862.patch
 rename meta-python/recipes-devtools/python/{python3-protobuf_3.6.1.bb => python3-protobuf_3.8.0.bb} (78%)
meta-python/recipes-devtools/python/python-protobuf.inc +2 -2
index 54eacc0b7..2929700a0 100644
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec
 
 inherit pypi
 
-SRC_URI[md5sum] = "e2daef80e70249aa1f05363670c6b3f8"
-SRC_URI[sha256sum] = "1489b376b0f364bcc6f89519718c057eb191d7ad6f1b395ffd93d1aa45587811"
+SRC_URI[md5sum] = "b7095f3eb736459716d606677b5a29ee"
+SRC_URI[sha256sum] = "8c61cc8a76e9d381c665aecc5105fa0f1878cf7db8b5cd17202603bcb386d0fc"
 
 # http://errors.yoctoproject.org/Errors/Details/184715/
 # Can't find required file: ../src/google/protobuf/descriptor.proto
meta-python/recipes-devtools/python/python-protobuf_3.8.0.bb renamed from meta-python/recipes-devtools/python/python-protobuf_3.6.1.bb +0 -0
similarity index 100%
rename from meta-python/recipes-devtools/python/python-protobuf_3.6.1.bb
rename to meta-python/recipes-devtools/python/python-protobuf_3.8.0.bb
meta-python/recipes-devtools/python/python3-protobuf/0001-Add-Python-3.7-compatibility-4862.patch deleted +0 -98

98 lines not on this page · raw message

meta-python/recipes-devtools/python/python3-protobuf_3.8.0.bb renamed from meta-python/recipes-devtools/python/python3-protobuf_3.6.1.bb +0 -1
similarity index 78%
rename from meta-python/recipes-devtools/python/python3-protobuf_3.6.1.bb
rename to meta-python/recipes-devtools/python/python3-protobuf_3.8.0.bb
index 9b0668a02..30ea34e90 100644
@@ -1,7 +1,6 @@
 inherit setuptools3
 require python-protobuf.inc
 
-SRC_URI += "file://0001-Add-Python-3.7-compatibility-4862.patch"
 DEPENDS += "protobuf"
 DISTUTILS_BUILD_ARGS += "--cpp_implementation"
 DISTUTILS_INSTALL_ARGS += "--cpp_implementation"
Signature · 1 line
2.11.0
#3 lore raw
In reply to Pascal Bach

With the upgrade now merged in master I'm seeing following failure:

./.libs/libprotoc.so: error: undefined reference to 'descriptor_table_google_2fprotobuf_2fdescriptor_2eproto' ./.libs/libprotoc.so: error: undefined reference to 'scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto'
collect2: error: ld returned 1 exit status
Makefile:3923: recipe for target 'protoc' failed

My guess it's caused by gold linker being used in my builds (with ld-is-gold DISTRO_FEATURE).

Anyone else seeing this?

Quoted 118 lines · Pascal Bach

Simple update to latest release

The patch is needed to make python3-protobuf compile as otherwise a file it expects is missing.

---
 ...s-map_util.h-to-list-of-installed-headers.patch | 52
++++++++++++++++++++++
 .../{protobuf_3.6.1.bb => protobuf_3.8.0.bb}       |  7 ++-
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644
meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch
 rename meta-oe/recipes-devtools/protobuf/{protobuf_3.6.1.bb =>

protobuf_3.8.0.bb} (93%)

diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file mode 100644
index 000000000..a160e5e97
--- /dev/null
+++
b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch

meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +10 -0
@@ -0,0 +1,52 @@
+From ea6e776e50971c89ad2293046b6ae2a6a9753c56 Mon Sep 17 00:00:00 2001
+From: Adam Cozzette <[email protected]>
+Date: Thu, 6 Jun 2019 10:29:58 -0700
+Subject: [PATCH] Added stubs/map_util.h to list of installed headers
+
+This should fix issue #6186. I also had to remove a couple unnecessary
+const keywords in map_util.h because the no_warning_test was showing
+errors about those.
+
+Upstream-Status: Submitted [

https://github.com/protocolbuffers/protobuf/pull/6223]

+---
+ src/Makefile.am                      | 1 +
+ src/google/protobuf/stubs/map_util.h | 4 ++--

+ 2 files changed, 3 insertions(+), 2 deletions(-)

meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +14 -0
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index be18ba76..1689e221 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -72,6 +72,7 @@ nobase_include_HEADERS =
         \
+   google/protobuf/stubs/hash.h                                   \
+   google/protobuf/stubs/logging.h                                \
+   google/protobuf/stubs/macros.h                                 \
++  google/protobuf/stubs/map_util.h                               \
+   google/protobuf/stubs/mutex.h                                  \
+   google/protobuf/stubs/once.h                                   \
+   google/protobuf/stubs/platform_macros.h                        \
+diff --git a/src/google/protobuf/stubs/map_util.h

b/src/google/protobuf/stubs/map_util.h
+index 2313e1f5..b04d9d46 100644
+--- a/src/google/protobuf/stubs/map_util.h
++++ b/src/google/protobuf/stubs/map_util.h
+@@ -620,7 +620,7 @@ bool UpdateReturnCopy(Collection* const collection,
+ // twice. Unlike UpdateReturnCopy this also does not come with the issue of an
+ // undefined previous* in case new data was inserted.
+ template <class Collection>
+-typename Collection::value_type::second_type* const ++typename Collection::value_type::second_type*
+ InsertOrReturnExisting(Collection* const collection,

(quoted diff) +2 -0
+                        const typename Collection::value_type& vt) {
+   std::pair<typename Collection::iterator, bool> ret =

collection->insert(vt);
+@@ -633,7 +633,7 @@ InsertOrReturnExisting(Collection* const collection,

meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +11 -0
+
+ // Same as above, except for explicit key and data.
+ template <class Collection>
+-typename Collection::value_type::second_type* const
++typename Collection::value_type::second_type*
+ InsertOrReturnExisting(
+     Collection* const collection,
+     const typename Collection::value_type::first_type& key,
+--
+2.11.0
+
meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb renamed from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb +0 -0
similarity index 93%
rename from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb
index cf72d9ca7..476d1e309 100644
@@ -10,13 +10,12 @@ LIC_FILES_CHKSUM =

"file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
DEPENDS = "zlib"
DEPENDS_append_class-target = " protobuf-native"

meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb renamed from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb +3 -5
-PV .= "+git${SRCPV}"
+SRCREV = "09745575a923640154bcf307fba8aedff47f240a"
 
-SRCREV = "48cb18e5c419ddd23d9badcfe4e9df7bde1979b2"
-
-SRC_URI = "git://github.com/google/protobuf.git;branch=3.6.x \
+SRC_URI = "git://github.com/google/protobuf.git;branch=3.8.x \
            file://run-ptest \
            file://0001-protobuf-fix-configure-error.patch \
+
 file://0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch \
 "
 S = "${WORKDIR}/git"
 
--

2.11.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#4 lore raw

Whole log with gold:
http://errors.yoctoproject.org/Errors/Details/249993/

then I've tried with bfd (after adding: CXXFLAGS_append = " -fuse-ld=bfd") and it fails as well:
http://errors.yoctoproject.org/Errors/Details/249995/

These logs are with musl, but all my other protobuf failures were with glibc, so it's not related to musl as well.

Quoted 136 lines · Martin Jansa

With the upgrade now merged in master I'm seeing following failure:

./.libs/libprotoc.so: error: undefined reference to 'descriptor_table_google_2fprotobuf_2fdescriptor_2eproto' ./.libs/libprotoc.so: error: undefined reference to 'scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto'
collect2: error: ld returned 1 exit status
Makefile:3923: recipe for target 'protoc' failed

My guess it's caused by gold linker being used in my builds (with ld-is-gold DISTRO_FEATURE).

Anyone else seeing this?

Quoted 118 lines · Pascal Bach

Simple update to latest release

The patch is needed to make python3-protobuf compile as otherwise a file it expects is missing.

---
 ...s-map_util.h-to-list-of-installed-headers.patch | 52
++++++++++++++++++++++
 .../{protobuf_3.6.1.bb => protobuf_3.8.0.bb}       |  7 ++-
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644
meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch
 rename meta-oe/recipes-devtools/protobuf/{protobuf_3.6.1.bb =>

protobuf_3.8.0.bb} (93%)

diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file mode 100644
index 000000000..a160e5e97
--- /dev/null
+++
b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch

meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +10 -0
@@ -0,0 +1,52 @@
+From ea6e776e50971c89ad2293046b6ae2a6a9753c56 Mon Sep 17 00:00:00 2001
+From: Adam Cozzette <[email protected]>
+Date: Thu, 6 Jun 2019 10:29:58 -0700
+Subject: [PATCH] Added stubs/map_util.h to list of installed headers
+
+This should fix issue #6186. I also had to remove a couple unnecessary
+const keywords in map_util.h because the no_warning_test was showing
+errors about those.
+
+Upstream-Status: Submitted [

https://github.com/protocolbuffers/protobuf/pull/6223]

+---
+ src/Makefile.am                      | 1 +
+ src/google/protobuf/stubs/map_util.h | 4 ++--

+ 2 files changed, 3 insertions(+), 2 deletions(-)

meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +14 -0
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index be18ba76..1689e221 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -72,6 +72,7 @@ nobase_include_HEADERS =
           \
+   google/protobuf/stubs/hash.h                                   \
+   google/protobuf/stubs/logging.h                                \
+   google/protobuf/stubs/macros.h                                 \
++  google/protobuf/stubs/map_util.h                               \
+   google/protobuf/stubs/mutex.h                                  \
+   google/protobuf/stubs/once.h                                   \
+   google/protobuf/stubs/platform_macros.h                        \
+diff --git a/src/google/protobuf/stubs/map_util.h

b/src/google/protobuf/stubs/map_util.h
+index 2313e1f5..b04d9d46 100644
+--- a/src/google/protobuf/stubs/map_util.h
++++ b/src/google/protobuf/stubs/map_util.h
+@@ -620,7 +620,7 @@ bool UpdateReturnCopy(Collection* const collection,
+ // twice. Unlike UpdateReturnCopy this also does not come with the issue of an
+ // undefined previous* in case new data was inserted.
+ template <class Collection>
+-typename Collection::value_type::second_type* const ++typename Collection::value_type::second_type*
+ InsertOrReturnExisting(Collection* const collection,

(quoted diff) +2 -0
+                        const typename Collection::value_type& vt) {
+   std::pair<typename Collection::iterator, bool> ret =

collection->insert(vt);
+@@ -633,7 +633,7 @@ InsertOrReturnExisting(Collection* const collection,

meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +11 -0
+
+ // Same as above, except for explicit key and data.
+ template <class Collection>
+-typename Collection::value_type::second_type* const
++typename Collection::value_type::second_type*
+ InsertOrReturnExisting(
+     Collection* const collection,
+     const typename Collection::value_type::first_type& key,
+--
+2.11.0
+
meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb renamed from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb +0 -0
similarity index 93%
rename from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb
index cf72d9ca7..476d1e309 100644
@@ -10,13 +10,12 @@ LIC_FILES_CHKSUM =

"file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
DEPENDS = "zlib"
DEPENDS_append_class-target = " protobuf-native"

meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb renamed from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb +3 -5
-PV .= "+git${SRCPV}"
+SRCREV = "09745575a923640154bcf307fba8aedff47f240a"
 
-SRCREV = "48cb18e5c419ddd23d9badcfe4e9df7bde1979b2"
-
-SRC_URI = "git://github.com/google/protobuf.git;branch=3.6.x \
+SRC_URI = "git://github.com/google/protobuf.git;branch=3.8.x \
            file://run-ptest \
            file://0001-protobuf-fix-configure-error.patch \
+
 file://0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch \
 "
 S = "${WORKDIR}/git"
 
--

2.11.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#5 lore raw

I have a fix for this, will send it to ML after a bit more testing.

There is still the random build failure in protobuf-c-native with latest meta-oe master.

Quoted 150 lines · Martin Jansa

Whole log with gold:
http://errors.yoctoproject.org/Errors/Details/249993/

then I've tried with bfd (after adding: CXXFLAGS_append = " -fuse-ld=bfd") and it fails as well:
http://errors.yoctoproject.org/Errors/Details/249995/

These logs are with musl, but all my other protobuf failures were with glibc, so it's not related to musl as well.

Quoted 136 lines · Martin Jansa

With the upgrade now merged in master I'm seeing following failure:

./.libs/libprotoc.so: error: undefined reference to 'descriptor_table_google_2fprotobuf_2fdescriptor_2eproto' ./.libs/libprotoc.so: error: undefined reference to 'scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto'
collect2: error: ld returned 1 exit status
Makefile:3923: recipe for target 'protoc' failed

My guess it's caused by gold linker being used in my builds (with ld-is-gold DISTRO_FEATURE).

Anyone else seeing this?

Quoted 118 lines · Pascal Bach

Simple update to latest release

The patch is needed to make python3-protobuf compile as otherwise a file it expects is missing.

---
 ...s-map_util.h-to-list-of-installed-headers.patch | 52
++++++++++++++++++++++
 .../{protobuf_3.6.1.bb => protobuf_3.8.0.bb}       |  7 ++-
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644
meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch
 rename meta-oe/recipes-devtools/protobuf/{protobuf_3.6.1.bb =>

protobuf_3.8.0.bb} (93%)

diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file mode 100644
index 000000000..a160e5e97
--- /dev/null
+++
b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch

meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +10 -0
@@ -0,0 +1,52 @@
+From ea6e776e50971c89ad2293046b6ae2a6a9753c56 Mon Sep 17 00:00:00 2001
+From: Adam Cozzette <[email protected]>
+Date: Thu, 6 Jun 2019 10:29:58 -0700
+Subject: [PATCH] Added stubs/map_util.h to list of installed headers
+
+This should fix issue #6186. I also had to remove a couple unnecessary
+const keywords in map_util.h because the no_warning_test was showing
+errors about those.
+
+Upstream-Status: Submitted [

https://github.com/protocolbuffers/protobuf/pull/6223]

+---
+ src/Makefile.am                      | 1 +
+ src/google/protobuf/stubs/map_util.h | 4 ++--

+ 2 files changed, 3 insertions(+), 2 deletions(-)

meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +14 -0
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index be18ba76..1689e221 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -72,6 +72,7 @@ nobase_include_HEADERS =
           \
+   google/protobuf/stubs/hash.h                                   \
+   google/protobuf/stubs/logging.h                                \
+   google/protobuf/stubs/macros.h                                 \
++  google/protobuf/stubs/map_util.h                               \
+   google/protobuf/stubs/mutex.h                                  \
+   google/protobuf/stubs/once.h                                   \
+   google/protobuf/stubs/platform_macros.h                        \
+diff --git a/src/google/protobuf/stubs/map_util.h

b/src/google/protobuf/stubs/map_util.h
+index 2313e1f5..b04d9d46 100644
+--- a/src/google/protobuf/stubs/map_util.h
++++ b/src/google/protobuf/stubs/map_util.h
+@@ -620,7 +620,7 @@ bool UpdateReturnCopy(Collection* const collection,
+ // twice. Unlike UpdateReturnCopy this also does not come with the issue of an
+ // undefined previous* in case new data was inserted.
+ template <class Collection>
+-typename Collection::value_type::second_type* const ++typename Collection::value_type::second_type*
+ InsertOrReturnExisting(Collection* const collection,

(quoted diff) +2 -0
+                        const typename Collection::value_type& vt) {
+   std::pair<typename Collection::iterator, bool> ret =

collection->insert(vt);
+@@ -633,7 +633,7 @@ InsertOrReturnExisting(Collection* const collection,

meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file +11 -0
+
+ // Same as above, except for explicit key and data.
+ template <class Collection>
+-typename Collection::value_type::second_type* const
++typename Collection::value_type::second_type*
+ InsertOrReturnExisting(
+     Collection* const collection,
+     const typename Collection::value_type::first_type& key,
+--
+2.11.0
+
meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb renamed from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb +0 -0
similarity index 93%
rename from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb
index cf72d9ca7..476d1e309 100644
@@ -10,13 +10,12 @@ LIC_FILES_CHKSUM =

"file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
DEPENDS = "zlib"
DEPENDS_append_class-target = " protobuf-native"

meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb renamed from meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb +3 -5
-PV .= "+git${SRCPV}"
+SRCREV = "09745575a923640154bcf307fba8aedff47f240a"
 
-SRCREV = "48cb18e5c419ddd23d9badcfe4e9df7bde1979b2"
-
-SRC_URI = "git://github.com/google/protobuf.git;branch=3.6.x \
+SRC_URI = "git://github.com/google/protobuf.git;branch=3.8.x \
            file://run-ptest \
            file://0001-protobuf-fix-configure-error.patch \
+
 file://0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch \
 "
 S = "${WORKDIR}/git"
 
--

2.11.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel