mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
protobuf: 4.25.5 -> 5.29.4
Refresh local patches - 0001-Fix-build-on-mips-clang.patch - 0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch Fix protobuf-native build failure with gcc 10 Fix dev-elf QA issue: |ERROR: protobuf-5.29.4-r0 do_package_qa: QA Issue: -dev package protobuf-dev contains non-symlink .so '/usr/lib/libutf8_range.so' [dev-elf] |ERROR: protobuf-5.29.4-r0 do_package_qa: QA Issue: -dev package protobuf-dev contains non-symlink .so '/usr/lib/libutf8_validity.so' [dev-elf] Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v29.4 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
Khem Raj
parent
eee1e11a4d
commit
d9daf66b11
|
|
@ -1,6 +1,6 @@
|
|||
From 08e46feb6553af670754e65d94c3bb6fcd4e0cf9 Mon Sep 17 00:00:00 2001
|
||||
From cd6c5f36c0dc38e4734b74b03923489b7bfb9aba Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 31 Oct 2021 23:39:44 -0700
|
||||
Date: Mon, 10 Mar 2025 19:59:19 -0700
|
||||
Subject: [PATCH] Fix build on mips/clang
|
||||
|
||||
clang13 crashes on mips, until its fixed upstream disable tailcall on
|
||||
|
|
@ -10,17 +10,25 @@ https://bugs.llvm.org/show_bug.cgi?id=52367
|
|||
|
||||
Upstream-Status: Inappropriate [Clang workaround]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/google/protobuf/port_def.inc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Rebase to v5.29.4
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
src/google/protobuf/port_def.inc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
|
||||
index 56f995e45..428d096b3 100644
|
||||
--- a/src/google/protobuf/port_def.inc
|
||||
+++ b/src/google/protobuf/port_def.inc
|
||||
@@ -255,6 +255,7 @@
|
||||
@@ -227,6 +227,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
|
||||
#error PROTOBUF_TAILCALL was previously defined
|
||||
#endif
|
||||
#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
|
||||
#if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) && \
|
||||
+ !defined(__mips__) && \
|
||||
!defined(_ARCH_PPC) && !defined(__wasm__) && \
|
||||
!(defined(_MSC_VER) && defined(_M_IX86)) && \
|
||||
!(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24)
|
||||
!defined(_ARCH_PPC) && !defined(__wasm__) && \
|
||||
!(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__)
|
||||
// Compilation fails on ARM32: b/195943306
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
From e3fa241637ab5a7fa78c0d474802134cff75f91e Mon Sep 17 00:00:00 2001
|
||||
From f6a3554e37fb39f93e4b47a75318bbda53cfdb46 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
|
||||
with gold
|
||||
Date: Thu, 20 Mar 2025 20:33:02 -0700
|
||||
Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables
|
||||
|
||||
* move pkg-config call to separate variable, so that the final version
|
||||
of the whole command so it's shown in log.do_compile_ptest_base
|
||||
* add ../src/google/protobuf/.libs/timestamp.pb.o when linking
|
||||
add_person_cpp otherwise it fails to link with gold:
|
||||
add_person_cpp otherwise it fails:
|
||||
i686-oe-linux-g++ -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=core2-32-oe-linux/protobuf/3.8.0-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
|
||||
/tmp/cccjSJQs.o:addressbook.pb.cc:scc_info_Person_addressbook_2eproto: error: undefined reference to 'scc_info_Timestamp_google_2fprotobuf_2ftimestamp_2eproto'
|
||||
/tmp/cccjSJQs.o:addressbook.pb.cc:descriptor_table_addressbook_2eproto_deps: error: undefined reference to 'descriptor_table_google_2fprotobuf_2ftimestamp_2eproto'
|
||||
|
|
@ -25,37 +24,39 @@ Upstream-Status: Pending
|
|||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
|
||||
|
||||
Rebase to 5.29.4
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
examples/Makefile | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/examples/Makefile b/examples/Makefile
|
||||
index ef7a4ef58..7206e14e1 100644
|
||||
index f7ee9b116..8cd1359e2 100644
|
||||
--- a/examples/Makefile
|
||||
+++ b/examples/Makefile
|
||||
@@ -2,6 +2,8 @@
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
.PHONY: all cpp java python clean
|
||||
all: cpp java python
|
||||
|
||||
+PROTOBUF := $(shell pkg-config --cflags --libs protobuf)
|
||||
+
|
||||
all: cpp java python
|
||||
|
||||
cpp: add_person_cpp list_people_cpp
|
||||
@@ -41,11 +43,11 @@ protoc_middleman_dart: addressbook.proto
|
||||
dart: add_person_dart list_people_dart
|
||||
go: add_person_go list_people_go
|
||||
@@ -46,11 +48,11 @@ protoc_middleman_ruby: addressbook.proto
|
||||
|
||||
add_person_cpp: add_person.cc protoc_middleman
|
||||
pkg-config --cflags protobuf # fails if protobuf is not installed
|
||||
- c++ -std=c++14 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 #$(CXX) -std=c++17 $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
|
||||
+ $(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++ -std=c++14 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 #$(CXX) -std=c++17 $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
|
||||
+ $(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.34.1
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
From 213f29fb63473304db098b3d12a0393fd50e4914 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 17 Mar 2025 13:28:13 +0800
|
||||
Subject: [PATCH] fix protobuf-native build failure with gcc 10
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Build protobuf-native failed on ubuntu 20.04 which has gcc 10
|
||||
|
||||
protobuf-native/4.30.0/git/src/google/protobuf/port_def.inc:105:48:
|
||||
error: static assertion failed: Protobuf only supports C+
|
||||
↪ +17 and newer.
|
||||
| 105 | #define PROTOBUF_CPLUSPLUS_MIN(x) (__cplusplus >= x)
|
||||
| | ~~~~~~~~~~~~~^~~~~
|
||||
| /home/kraj01/yoe/build/tmp/work/x86_64-linux/protobuf-native/4.30.0/git/src/google/protobuf/port_def.inc:119:15:
|
||||
note: in expansion of macro ‘PROTOBUF_CPLUSPLUS_MIN’
|
||||
| 119 | static_assert(PROTOBUF_CPLUSPLUS_MIN(201703L),
|
||||
| | ^~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
CMakeLists.txt | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e90cb8aa2..3ffac1307 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -14,6 +14,10 @@ endif()
|
||||
# Project
|
||||
project(protobuf C CXX)
|
||||
|
||||
+set(CMAKE_CXX_STANDARD 17)
|
||||
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
+set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
+
|
||||
if(protobuf_DEPRECATED_CMAKE_SUBDIRECTORY_USAGE)
|
||||
if(CMAKE_PROJECT_NAME STREQUAL "protobuf")
|
||||
get_filename_component(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
From fd020ef700dbf2d324aecd087b8fcb6ff329feb6 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Thu, 21 Nov 2024 11:30:17 -0800
|
||||
Subject: [PATCH] utf8_range: add version marker to library (#19009)
|
||||
|
||||
Unversioned libraries / libraries without due ABI indicators are not allowed in certain Linux distributions because it precludes the concurrent presence of multiple versions.
|
||||
|
||||
If you have both /usr/lib/libprotobuf-lite.so.28.3.0 and /usr/lib/libprotobuf-lite.so.29.0.0, both of them want libutf8_validity.so, but if the ABI is different between utf8_range 28 and utf8_range 29, that's a problem.
|
||||
|
||||
Closes #19009
|
||||
|
||||
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/19009 from jengelh:master 1a5f8682be2f2b84da07fcdd32474baae8088959
|
||||
PiperOrigin-RevId: 698855702
|
||||
|
||||
Upstream-Status: Backport [https://github.com/protocolbuffers/protobuf/commit/ced605d0e6a7ad20985375b596b2ca6720e07737]
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
third_party/utf8_range/CMakeLists.txt | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/third_party/utf8_range/CMakeLists.txt b/third_party/utf8_range/CMakeLists.txt
|
||||
index 4276b97290..e054893c63 100644
|
||||
--- a/third_party/utf8_range/CMakeLists.txt
|
||||
+++ b/third_party/utf8_range/CMakeLists.txt
|
||||
@@ -19,6 +19,15 @@ add_library (utf8_range
|
||||
# A heavier-weight C++ wrapper that supports Abseil.
|
||||
add_library (utf8_validity utf8_validity.cc utf8_range.c)
|
||||
|
||||
+set_target_properties(utf8_range PROPERTIES
|
||||
+ VERSION ${protobuf_VERSION}
|
||||
+ OUTPUT_NAME ${LIB_PREFIX}utf8_range
|
||||
+)
|
||||
+set_target_properties(utf8_validity PROPERTIES
|
||||
+ VERSION ${protobuf_VERSION}
|
||||
+ OUTPUT_NAME ${LIB_PREFIX}utf8_validity
|
||||
+)
|
||||
+
|
||||
# Load Abseil dependency.
|
||||
if (NOT TARGET absl::strings)
|
||||
if (NOT ABSL_ROOT_DIR)
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -14,11 +14,13 @@ LIC_FILES_CHKSUM = " \
|
|||
DEPENDS = "zlib abseil-cpp jsoncpp"
|
||||
DEPENDS:append:class-target = " protobuf-native"
|
||||
|
||||
SRCREV = "9d0ec0f92b5b5fdeeda11f9dcecc1872ff378014"
|
||||
SRCREV = "1be1c9d0ea6efa2a25bd7b76186844d1669be78a"
|
||||
|
||||
SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \
|
||||
SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=29.x;protocol=https \
|
||||
file://run-ptest \
|
||||
file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \
|
||||
file://0001-fix-protobuf-native-build-failure-with-gcc-10.patch \
|
||||
file://0001-utf8_range-add-version-marker-to-library-19009.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 "
|
||||
Loading…
Reference in New Issue
Block a user