[oe] [meta-oe][PATCHv4 1/3] protobuf: 3.6.1 -> 3.8.0
Martin Jansa
martin.jansa at gmail.com
Mon Jun 24 20:09:02 UTC 2019
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.
On Mon, Jun 24, 2019 at 8:08 PM Martin Jansa <martin.jansa at gmail.com> wrote:
> 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?
>
> On Mon, Jun 17, 2019 at 12:23 PM Pascal Bach <pascal.bach at siemens.com>
> wrote:
>
>> Simple update to latest release
>>
>> The patch is needed to make python3-protobuf compile
>> as otherwise a file it expects is missing.
>>
>> Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
>> ---
>> ...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
>> @@ -0,0 +1,52 @@
>> +From ea6e776e50971c89ad2293046b6ae2a6a9753c56 Mon Sep 17 00:00:00 2001
>> +From: Adam Cozzette <acozzette at google.com>
>> +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
>> +
>> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb
>> b/meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb
>> 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
>> --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb
>> +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb
>> @@ -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"
>>
>> --
>> 2.11.0
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>
More information about the Openembedded-devel
mailing list