CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

protobuf: 5.29.5 -> 6.31.1

Browse Source 
Refresh local patches:
- 0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch

Fix protobuf build error due to recent abseil-cpp update:
https://git.openembedded.org/meta-openembedded/commit/?h=master&id=e8c0e64e89b565a55d4c4fefe30a90a25fbe5831

Changelog:
https://github.com/protocolbuffers/protobuf/releases/tag/v31.1

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Ryan Eatmon 2025-06-25 18:56:44 -05:00 committed by Khem Raj
parent e4c238af7d
commit 8016c50f15
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
View File

@ -47,12 +47,12 @@ 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

6
meta-oe/recipes-devtools/protobuf/protobuf_5.29.5.bb → meta-oe/recipes-devtools/protobuf/protobuf_6.31.1.bb
View File

@ -7,20 +7,18 @@ SECTION = "console/tools"
LICENSE = "BSD-3-Clause & MIT"
LIC_FILES_CHKSUM = " \
file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
file://third_party/lunit/LICENSE;md5=99f08e72434dfa34fe0581d3dfb2d7f4 \
file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \
"
DEPENDS = "zlib abseil-cpp jsoncpp"
DEPENDS:append:class-target = " protobuf-native"
SRCREV = "f5de0a0495faa63b4186fc767324f8b9a7bf4fc4"
SRCREV = "74211c0dfc2777318ab53c2cd2c317a2ef9012de"
SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=29.x;protocol=https \
SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=31.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 "