helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

protobuf: upgrade 4.22.2 -> 4.23.4

Browse Source 
Bump protobuf to 4.23.4 to fix build with musl.

Signed-off-by: Clément Péron <peron.clem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Clément Péron 2023-09-27 10:42:40 +02:00 committed by Khem Raj
parent 8b3cc547b7
commit 39d8b9b7e6
2 changed files with 10 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch
View File

@ -1,69 +0,0 @@
From a91130bb95528743a3f7253f8fe945b7505047d5 Mon Sep 17 00:00:00 2001
From: Kyungjik Min <dp.min@lge.com>
Date: Mon, 28 Dec 2020 15:56:09 +0900
Subject: [PATCH] Fix linking error with ld-gold
:Release Notes:
:Detailed Notes:
https://github.com/protocolbuffers/protobuf/issues/6113
There's a bug in the CMake build leading it to not use the version
scripts, which hides the problem (because all symbols are now public)
but doesn't solve it properly.
:Testing Performed:
:QA Notes:
N/A
:Issues Addressed:
[PLAT-130467] Fix build error for libgoogleassistant with latest
protobuf-3.11.4
---
Upstream-Status: Pending
src/libprotobuf-lite.map | 2 ++
src/libprotobuf.map | 2 ++
src/libprotoc.map | 2 ++
3 files changed, 6 insertions(+)
diff --git a/src/libprotobuf-lite.map b/src/libprotobuf-lite.map
index 391554669..a1853ca6c 100644
--- a/src/libprotobuf-lite.map
+++ b/src/libprotobuf-lite.map
@@ -3,6 +3,8 @@
extern "C++" {
*google*;
};
+ scc_info_*;
+ descriptor_table_*;
local:
*;
diff --git a/src/libprotobuf.map b/src/libprotobuf.map
index 391554669..a1853ca6c 100644
--- a/src/libprotobuf.map
+++ b/src/libprotobuf.map
@@ -3,6 +3,8 @@
extern "C++" {
*google*;
};
+ scc_info_*;
+ descriptor_table_*;
local:
*;
diff --git a/src/libprotoc.map b/src/libprotoc.map
index 391554669..a1853ca6c 100644
--- a/src/libprotoc.map
+++ b/src/libprotoc.map
@@ -3,6 +3,8 @@
extern "C++" {
*google*;
};
+ scc_info_*;
+ descriptor_table_*;
local:
*;

16
meta-oe/recipes-devtools/protobuf/protobuf_4.22.2.bb → meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb
View File

@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
DEPENDS = "zlib abseil-cpp"
DEPENDS:append:class-target = " protobuf-native"
SRCREV = "81f89d509d6771dcccb619cbe26ac86cec472582"
SRCREV = "2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a"
SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=22.x;protocol=https \
SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=23.x;protocol=https \
file://run-ptest \
file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \
file://0001-Fix-linking-error-with-ld-gold.patch \
"
SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "
SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "
@ -51,13 +50,18 @@ do_compile_ptest() {
cp ${S}/${TEST_SRC_DIR}/*.proto "${B}/${TEST_SRC_DIR}/"
cp ${S}/${TEST_SRC_DIR}/*.py "${B}/${TEST_SRC_DIR}/"
cp ${S}/${TEST_SRC_DIR}/Makefile "${B}/${TEST_SRC_DIR}/"
# Adapt protobuf.pc
sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
sed -e 's|Cflags:|Cflags: -I${WORKDIR}/recipe-sysroot{includedir} |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
sed -e 's|Cflags:|Cflags: -I${S}/src |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
sed -e 's|Cflags:|Cflags: -I${WORKDIR}/recipe-sysroot${includedir} |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
sed -e 's|Libs:|Libs: -L${B}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
sed -e 's|Libs:|Libs: -L${WORKDIR}/recipe-sysroot/usr/lib|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
sed -e 's|Libs:|Libs: -L${WORKDIR}/recipe-sysroot/usr/lib |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
sed -e 's|Libs:|Libs: -labsl_log_internal_check_op |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
sed -e 's|Libs:|Libs: -labsl_log_internal_message |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
# Adapt uf8_range.pc
cp "${B}/third_party/utf8_range/utf8_range.pc" "${B}/${TEST_SRC_DIR}/utf8_range.pc"
sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc"
sed -e 's|Libs:|Libs= -L${B}/third_party/utf8_range |' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc"
# Until out-of-tree build of examples is supported, we have to use this approach
sed -e 's|../src/google/protobuf/.libs/timestamp.pb.o|${B}/CMakeFiles/libprotobuf.dir/src/google/protobuf/timestamp.pb.cc.o|' -i "${B}/${TEST_SRC_DIR}/Makefile"
export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}"