diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch index 7a8906a9a4..77155af4ee 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch +++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch @@ -31,7 +31,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index f7ee9b116..8cd1359e2 100644 +index 5290fdb..8cd1359 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -4,6 +4,8 @@ @@ -47,16 +47,16 @@ index f7ee9b116..8cd1359e2 100644 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` +- c++ 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++ -std=c++14 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` +- c++ 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.25.1 +2.43.0 diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch deleted file mode 100644 index e58fdc1d19..0000000000 --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fd020ef700dbf2d324aecd087b8fcb6ff329feb6 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -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 ---- - 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 - diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_5.29.4.bb b/meta-oe/recipes-devtools/protobuf/protobuf_6.30.1.bb similarity index 97% rename from meta-oe/recipes-devtools/protobuf/protobuf_5.29.4.bb rename to meta-oe/recipes-devtools/protobuf/protobuf_6.30.1.bb index 30b805e6b1..c3e701b5d3 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_5.29.4.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_6.30.1.bb @@ -14,13 +14,12 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "zlib abseil-cpp jsoncpp" DEPENDS:append:class-target = " protobuf-native" -SRCREV = "1be1c9d0ea6efa2a25bd7b76186844d1669be78a" +SRCREV = "0d815c5b74281f081c1ee4b431a4d5bbb1615c97" -SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=29.x;protocol=https \ +SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=30.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:mipsarcho32:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "