* [RFC PATCH 1/4] jsoncpp: extend with nativesdk
2023-07-20 16:22 [RFC PATCH 0/4] Bump Protobuf/gRPC Clément Péron
@ 2023-07-20 16:22 ` Clément Péron
2023-07-20 16:23 ` [RFC PATCH 2/4] devtools: protobuf: add utf8-range recipe Clément Péron
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Clément Péron @ 2023-07-20 16:22 UTC (permalink / raw)
To: openembedded-core; +Cc: Clément Péron
Jsoncpp doesn't extend for the moment with nativesdk
We will need jsoncpp in the next protobuf bump that will require
that.
Add the nativesdk to BBEXTENDS of the jsoncpp recipe.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb
index c54dc9466..086615649 100644
--- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb
@@ -22,4 +22,4 @@ inherit cmake
EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DBUILD_OBJECT_LIBS=OFF -DJSONCPP_WITH_TESTS=OFF"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [RFC PATCH 2/4] devtools: protobuf: add utf8-range recipe
2023-07-20 16:22 [RFC PATCH 0/4] Bump Protobuf/gRPC Clément Péron
2023-07-20 16:22 ` [RFC PATCH 1/4] jsoncpp: extend with nativesdk Clément Péron
@ 2023-07-20 16:23 ` Clément Péron
2023-07-20 16:23 ` [RFC PATCH 3/4] protobuf: bump to 3.23.4 Clément Péron
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Clément Péron @ 2023-07-20 16:23 UTC (permalink / raw)
To: openembedded-core; +Cc: Clément Péron
Utf8 range is a new algorithm that implement fast UTF8 validation.
It is required to compile examples for new protobuf.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
.../protobuf/utf8-range_git.bb | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 meta-oe/recipes-devtools/protobuf/utf8-range_git.bb
diff --git a/meta-oe/recipes-devtools/protobuf/utf8-range_git.bb b/meta-oe/recipes-devtools/protobuf/utf8-range_git.bb
new file mode 100644
index 000000000..86ecb74d6
--- /dev/null
+++ b/meta-oe/recipes-devtools/protobuf/utf8-range_git.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Fast UTF-8 validation with Range algorithm"
+DESCRIPTION = "This is a brand new algorithm to leverage SIMD for fast UTF-8 \
+string validation. Both NEON(armv8a) and SSE4 versions are implemented."
+HOMEPAGE = "https://github.com/protocolbuffers/utf8_range"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d4974d297231477b2ff507c35d61c13c"
+
+DEPENDS = "abseil-cpp"
+
+SRC_URI = "git://github.com/protocolbuffers/utf8_range.git;branch=main;protocol=https"
+SRCREV = "d863bc33e15cba6d873c878dcca9e6fe52b2f8cb"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE += "\
+ -Dutf8_range_ENABLE_TESTS=OFF \
+"
+
+BBCLASSEXTEND = "native nativesdk"
+
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [RFC PATCH 3/4] protobuf: bump to 3.23.4
2023-07-20 16:22 [RFC PATCH 0/4] Bump Protobuf/gRPC Clément Péron
2023-07-20 16:22 ` [RFC PATCH 1/4] jsoncpp: extend with nativesdk Clément Péron
2023-07-20 16:23 ` [RFC PATCH 2/4] devtools: protobuf: add utf8-range recipe Clément Péron
@ 2023-07-20 16:23 ` Clément Péron
2023-07-20 16:23 ` [RFC PATCH 4/4] devtools: grpc: bump to 1.56.2 Clément Péron
2023-07-20 16:38 ` [OE-core] [RFC PATCH 0/4] Bump Protobuf/gRPC Martin Jansa
4 siblings, 0 replies; 8+ messages in thread
From: Clément Péron @ 2023-07-20 16:23 UTC (permalink / raw)
To: openembedded-core; +Cc: Clément Péron
Bump to protobuf 3.23.4 with the following diff
- Add new abseil-cpp jsoncpp dependencies
- Linking with gold patch has been fixed see
commit 462964ed322503af52638d54c00a0a67d7133349
- Refresh the patch that fix examples LDFLAGS
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
.../0001-Fix-linking-error-with-ld-gold.patch | 69 -------------------
...e-respect-CXX-LDFLAGS-variables-fix-.patch | 4 +-
...protobuf_3.21.12.bb => protobuf_3.23.4.bb} | 8 ++-
3 files changed, 7 insertions(+), 74 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch
rename meta-oe/recipes-devtools/protobuf/{protobuf_3.21.12.bb => protobuf_3.23.4.bb} (95%)
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch
deleted file mode 100644
index 2bc44c898..000000000
--- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch
+++ /dev/null
@@ -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:
- *;
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 36c3c597a..f3eead39b 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
@@ -46,12 +46,12 @@ index 1c7ec8d63..85f591231 100644
add_person_cpp: add_person.cc protoc_middleman
pkg-config --cflags protobuf # fails if protobuf is not installed
-- c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
+- 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
list_people_cpp: list_people.cc protoc_middleman
pkg-config --cflags protobuf # fails if protobuf is not installed
-- c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
+- 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
add_person_dart: add_person.dart protoc_middleman_dart
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.23.4.bb
similarity index 95%
rename from meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_3.23.4.bb
index 343933033..a053afa78 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.23.4.bb
@@ -7,12 +7,12 @@ SECTION = "console/tools"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
-DEPENDS = "zlib"
+DEPENDS = "abseil-cpp jsoncpp zlib"
DEPENDS:append:class-target = " protobuf-native"
-SRCREV = "f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c"
+SRCREV = "2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a"
-SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=21.x;protocol=https \
+SRC_URI = "git://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 \
@@ -35,6 +35,8 @@ EXTRA_OECMAKE += "\
-Dprotobuf_BUILD_LIBPROTOC=ON \
-Dprotobuf_BUILD_TESTS=OFF \
-Dprotobuf_BUILD_EXAMPLES=OFF \
+ -Dprotobuf_ABSL_PROVIDER=package \
+ -Dprotobuf_JSONCPP_PROVIDER=package \
"
TEST_SRC_DIR = "examples"
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [RFC PATCH 4/4] devtools: grpc: bump to 1.56.2
2023-07-20 16:22 [RFC PATCH 0/4] Bump Protobuf/gRPC Clément Péron
` (2 preceding siblings ...)
2023-07-20 16:23 ` [RFC PATCH 3/4] protobuf: bump to 3.23.4 Clément Péron
@ 2023-07-20 16:23 ` Clément Péron
2023-07-20 16:38 ` [OE-core] [RFC PATCH 0/4] Bump Protobuf/gRPC Martin Jansa
4 siblings, 0 replies; 8+ messages in thread
From: Clément Péron @ 2023-07-20 16:23 UTC (permalink / raw)
To: openembedded-core; +Cc: Clément Péron
Remove merged patch that export plugin to a separate targets
Remove no more applicatable patch
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
...RPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch | 62 -------------
...d-separate-export-for-plugin-targets.patch | 93 -------------------
.../grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb} | 6 +-
3 files changed, 2 insertions(+), 159 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch
delete mode 100644 meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
rename meta-oe/recipes-devtools/grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb} (92%)
diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch
deleted file mode 100644
index b245ad865..000000000
--- a/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From dc593958e556dd496b774f35c5992285510d6859 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 19 Oct 2021 17:09:55 +0200
-Subject: [PATCH] Revert "Changed GRPCPP_ABSEIL_SYNC to GPR_ABSEIL_SYNC
- (#25681)"
-
-This reverts commit 931f91b745cd5b2864a0d1787815871d0bd844ae.
-
-Fixes sysdig from meta-oe and other recipes (like com.webos.service.tts
-libgoogleassistant from meta-webosose) failing with:
-
-| FAILED: userspace/sysdig/sysdig
-| : && /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-sec
-urity --sysroot=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -f
-debug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/bu
-ild/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/OE/build
-/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -Wall -ggdb -std=c++0x -O3 -fno-strict-aliasing -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security
---sysroot=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-p
-refix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-
-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/OE/build/oe-cor
-e/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-cor
-e/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-
-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/
-oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/
-core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -Wl,-z,relro,-z,now -rdynamic userspace/sysdig/CMakeFiles/sysdig.dir/fields_info.cpp.o userspace/sysdig/CMakeFiles/sysdig.dir/sysdig.cpp.o -o userspace/sysdig/sysdig userspace/libsinsp/libsinsp.a userspace/libscap/libscap.a
- -lelf -lz -lcurl -ljsoncpp -ltbb -lcares -lgrpc++_unsecure -lgrpc_unsecure -lprotobuf -lcares -lgrpc++_unsecure -lgrpc_unsecure -lprotobuf -ljq -lb64 -lrt -lanl -lssl -lcrypto -lluajit-5.1 -ldl -lpthread && :
-| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()'
-| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()'
-| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()'
-| /usr/include/grpcpp/impl/codegen/completion_queue.h:259: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()'
-| collect2: error: ld returned 1 exit status
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- include/grpcpp/impl/codegen/sync.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/grpcpp/impl/codegen/sync.h b/include/grpcpp/impl/codegen/sync.h
-index 4cb8133c7c..3d10d9a3a0 100644
---- a/include/grpcpp/impl/codegen/sync.h
-+++ b/include/grpcpp/impl/codegen/sync.h
-@@ -47,7 +47,7 @@
- namespace grpc {
- namespace internal {
-
--#ifdef GPR_ABSEIL_SYNC
-+#ifdef GRPCPP_ABSEIL_SYNC
-
- using Mutex = absl::Mutex;
- using MutexLock = absl::MutexLock;
-@@ -142,7 +142,7 @@ class CondVar {
- gpr_cv cv_;
- };
-
--#endif // GPR_ABSEIL_SYNC
-+#endif // GRPCPP_ABSEIL_SYNC
-
- template <typename Predicate>
- GRPC_DEPRECATED("incompatible with thread safety analysis")
diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
deleted file mode 100644
index 679bd3882..000000000
--- a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 3150cb043363e05588062dd392b940be25594713 Mon Sep 17 00:00:00 2001
-From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
-Date: Tue, 18 Feb 2020 14:17:07 +0100
-Subject: [PATCH] cmake: add separate export for plugin targets
-
-Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328]
-
-
----
- CMakeLists.txt | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index efdaf8936d..6608b1b00c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin
-
-
- if(gRPC_INSTALL)
-- install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets
-+ install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin
-
-
- if(gRPC_INSTALL)
-- install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets
-+ install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin
-
-
- if(gRPC_INSTALL)
-- install(TARGETS grpc_node_plugin EXPORT gRPCTargets
-+ install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin
-
-
- if(gRPC_INSTALL)
-- install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets
-+ install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin
-
-
- if(gRPC_INSTALL)
-- install(TARGETS grpc_php_plugin EXPORT gRPCTargets
-+ install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11135,7 +11135,7 @@ target_link_libraries(grpc_python_plugin
-
-
- if(gRPC_INSTALL)
-- install(TARGETS grpc_python_plugin EXPORT gRPCTargets
-+ install(TARGETS grpc_python_plugin EXPORT gRPCPluginTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11175,7 +11175,7 @@ target_link_libraries(grpc_ruby_plugin
-
-
- if(gRPC_INSTALL)
-- install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets
-+ install(TARGETS grpc_ruby_plugin EXPORT gRPCPluginTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -17349,6 +17349,10 @@ if(gRPC_INSTALL)
- DESTINATION ${gRPC_INSTALL_CMAKEDIR}
- NAMESPACE gRPC::
- )
-+ install(EXPORT gRPCPluginTargets
-+ DESTINATION ${gRPC_INSTALL_CMAKEDIR}
-+ NAMESPACE gRPC::
-+ )
- endif()
-
- include(CMakePackageConfigHelpers)
---
-2.30.2
-
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb b/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb
similarity index 92%
rename from meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb
rename to meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb
index 958992e1e..c4dd6b985 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb
@@ -20,11 +20,9 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler"
# RDEPENDS:${PN}-dev += "${PN}-compiler"
S = "${WORKDIR}/git"
-SRCREV_grpc = "90ccf24d22b6fc909a1021ebd89fd8c838467d26"
-BRANCH = "v1.50.x"
+SRCREV_grpc = "c0d1c393d9365664d47df41746e992ae97b651ef"
+BRANCH = "v1.56.x"
SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \
- file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \
- file://0001-cmake-add-separate-export-for-plugin-targets.patch \
file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \
"
# Fixes build with older compilers 4.8 especially on ubuntu 14.04
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [OE-core] [RFC PATCH 0/4] Bump Protobuf/gRPC
2023-07-20 16:22 [RFC PATCH 0/4] Bump Protobuf/gRPC Clément Péron
` (3 preceding siblings ...)
2023-07-20 16:23 ` [RFC PATCH 4/4] devtools: grpc: bump to 1.56.2 Clément Péron
@ 2023-07-20 16:38 ` Martin Jansa
2023-07-21 9:07 ` Clément Péron
[not found] ` <1773D6CEC3F30D4C.21241@lists.openembedded.org>
4 siblings, 2 replies; 8+ messages in thread
From: Martin Jansa @ 2023-07-20 16:38 UTC (permalink / raw)
To: Clément Péron; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3617 bytes --]
These patches should be sent to openembedded-devel not openembedded-core.
> ERROR: abseil-cpp-20230125.3-r0 do_package: Variable Requires:
absl_config = 20230125, absl_core_headers = 20230125,
absl_log_internal_append_truncated = 20230125, absl_log_internal_config =
20230125, absl_log_internal_globals = 20230125, absl_log_severity =
20230125, absl_strings = 20230125, absl_str_format = 20230125, absl_time =
20230125, absl_span contains an operation using the old override syntax.
Please convert this layer/metadata before attempting to use with a newer
bitbake.
Do you have this change in your build?
https://lists.openembedded.org/g/openembedded-core/message/179019
On Thu, Jul 20, 2023 at 6:25 PM Clément Péron <peron.clem@gmail.com> wrote:
> Hi,
>
> I'm trying to bump gRPC to a more recent version,
> but it requires a bump of protobuf.
>
> I'm strugling with the following issue when compiling:
>
> ERROR: abseil-cpp-20230125.3-r0 do_package: Variable Requires: absl_config
> = 20230125, absl_core_headers = 20230125,
> absl_log_internal_append_truncated = 20230125, absl_log_internal_config =
> 20230125, absl_log_internal_globals = 20230125, absl_log_severity =
> 20230125, absl_strings = 20230125, absl_str_format = 20230125, absl_time =
> 20230125, absl_span contains an operation using the old override syntax.
> Please convert this layer/metadata before attempting to use with a newer
> bitbake.
> ERROR: Logfile of failure stored in:
> /build/tmp/work/armv8a-poky-linux/abseil-cpp/20230125.3-r0/temp/log.do_package.2192204
> ERROR: Task
> (/build/../meta-outsight/recipes-devtools/abseil-cpp/abseil-cpp_git.bb:do_package)
> failed with exit code '1'
>
> Do you have an idea of what is happening?
>
> Thanks for your help
>
> Clément Péron (4):
> jsoncpp: extend with nativesdk
> devtools: protobuf: add utf8-range recipe
> protobuf: bump to 3.23.4
> devtools: grpc: bump to 1.56.2
>
> ...RPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch | 62 -------------
> ...d-separate-export-for-plugin-targets.patch | 93 -------------------
> .../grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb} | 6 +-
> .../recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb | 2 +-
> .../0001-Fix-linking-error-with-ld-gold.patch | 69 --------------
> ...e-respect-CXX-LDFLAGS-variables-fix-.patch | 4 +-
> ...protobuf_3.21.12.bb => protobuf_3.23.4.bb} | 8 +-
> .../protobuf/utf8-range_git.bb | 22 +++++
> 8 files changed, 32 insertions(+), 234 deletions(-)
> delete mode 100644
> meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch
> delete mode 100644
> meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
> rename meta-oe/recipes-devtools/grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb}
> (92%)
> delete mode 100644
> meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch
> rename meta-oe/recipes-devtools/protobuf/{protobuf_3.21.12.bb =>
> protobuf_3.23.4.bb} (95%)
> create mode 100644 meta-oe/recipes-devtools/protobuf/utf8-range_git.bb
>
> --
> 2.41.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184644):
> https://lists.openembedded.org/g/openembedded-core/message/184644
> Mute This Topic: https://lists.openembedded.org/mt/100259348/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
[-- Attachment #2: Type: text/html, Size: 5639 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [OE-core] [RFC PATCH 0/4] Bump Protobuf/gRPC
2023-07-20 16:38 ` [OE-core] [RFC PATCH 0/4] Bump Protobuf/gRPC Martin Jansa
@ 2023-07-21 9:07 ` Clément Péron
[not found] ` <1773D6CEC3F30D4C.21241@lists.openembedded.org>
1 sibling, 0 replies; 8+ messages in thread
From: Clément Péron @ 2023-07-21 9:07 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3990 bytes --]
Hi Martin,
On Thu, 20 Jul 2023 at 18:38, Martin Jansa <martin.jansa@gmail.com> wrote:
> These patches should be sent to openembedded-devel not openembedded-core.
>
Sorry about that. I will send the next version in the correct ML
> > ERROR: abseil-cpp-20230125.3-r0 do_package: Variable Requires:
> absl_config = 20230125, absl_core_headers = 20230125,
> absl_log_internal_append_truncated = 20230125, absl_log_internal_config =
> 20230125, absl_log_internal_globals = 20230125, absl_log_severity =
> 20230125, absl_strings = 20230125, absl_str_format = 20230125, absl_time =
> 20230125, absl_span contains an operation using the old override syntax.
> Please convert this layer/metadata before attempting to use with a newer
> bitbake.
>
> Do you have this change in your build?
> https://lists.openembedded.org/g/openembedded-core/message/179019
>
No, thanks for pointing out this fix, I have proposed a backport to
kirkstone.
Regards,
Clement
>
> On Thu, Jul 20, 2023 at 6:25 PM Clément Péron <peron.clem@gmail.com>
> wrote:
>
>> Hi,
>>
>> I'm trying to bump gRPC to a more recent version,
>> but it requires a bump of protobuf.
>>
>> I'm strugling with the following issue when compiling:
>>
>> ERROR: abseil-cpp-20230125.3-r0 do_package: Variable Requires:
>> absl_config = 20230125, absl_core_headers = 20230125,
>> absl_log_internal_append_truncated = 20230125, absl_log_internal_config =
>> 20230125, absl_log_internal_globals = 20230125, absl_log_severity =
>> 20230125, absl_strings = 20230125, absl_str_format = 20230125, absl_time =
>> 20230125, absl_span contains an operation using the old override syntax.
>> Please convert this layer/metadata before attempting to use with a newer
>> bitbake.
>> ERROR: Logfile of failure stored in:
>> /build/tmp/work/armv8a-poky-linux/abseil-cpp/20230125.3-r0/temp/log.do_package.2192204
>> ERROR: Task
>> (/build/../meta-outsight/recipes-devtools/abseil-cpp/abseil-cpp_git.bb:do_package)
>> failed with exit code '1'
>>
>> Do you have an idea of what is happening?
>>
>> Thanks for your help
>>
>> Clément Péron (4):
>> jsoncpp: extend with nativesdk
>> devtools: protobuf: add utf8-range recipe
>> protobuf: bump to 3.23.4
>> devtools: grpc: bump to 1.56.2
>>
>> ...RPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch | 62 -------------
>> ...d-separate-export-for-plugin-targets.patch | 93 -------------------
>> .../grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb} | 6 +-
>> .../recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb | 2 +-
>> .../0001-Fix-linking-error-with-ld-gold.patch | 69 --------------
>> ...e-respect-CXX-LDFLAGS-variables-fix-.patch | 4 +-
>> ...protobuf_3.21.12.bb => protobuf_3.23.4.bb} | 8 +-
>> .../protobuf/utf8-range_git.bb | 22 +++++
>> 8 files changed, 32 insertions(+), 234 deletions(-)
>> delete mode 100644
>> meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch
>> delete mode 100644
>> meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
>> rename meta-oe/recipes-devtools/grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb}
>> (92%)
>> delete mode 100644
>> meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch
>> rename meta-oe/recipes-devtools/protobuf/{protobuf_3.21.12.bb =>
>> protobuf_3.23.4.bb} (95%)
>> create mode 100644 meta-oe/recipes-devtools/protobuf/utf8-range_git.bb
>>
>> --
>> 2.41.0
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#184644):
>> https://lists.openembedded.org/g/openembedded-core/message/184644
>> Mute This Topic: https://lists.openembedded.org/mt/100259348/3617156
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
>> Martin.Jansa@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>>
[-- Attachment #2: Type: text/html, Size: 6832 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread[parent not found: <1773D6CEC3F30D4C.21241@lists.openembedded.org>]
* Re: [OE-core] [RFC PATCH 0/4] Bump Protobuf/gRPC
[not found] ` <1773D6CEC3F30D4C.21241@lists.openembedded.org>
@ 2023-07-22 10:11 ` Clément Péron
0 siblings, 0 replies; 8+ messages in thread
From: Clément Péron @ 2023-07-22 10:11 UTC (permalink / raw)
To: peron.clem; +Cc: Martin Jansa, openembedded-core, Wang Mingyu
[-- Attachment #1: Type: text/plain, Size: 4637 bytes --]
Hi,
On Fri, 21 Jul 2023 at 11:07, Clément Péron via lists.openembedded.org
<peron.clem=gmail.com@lists.openembedded.org> wrote:
> Hi Martin,
>
> On Thu, 20 Jul 2023 at 18:38, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> These patches should be sent to openembedded-devel not openembedded-core.
>>
>
> Sorry about that. I will send the next version in the correct ML
>
>
>> > ERROR: abseil-cpp-20230125.3-r0 do_package: Variable Requires:
>> absl_config = 20230125, absl_core_headers = 20230125,
>> absl_log_internal_append_truncated = 20230125, absl_log_internal_config =
>> 20230125, absl_log_internal_globals = 20230125, absl_log_severity =
>> 20230125, absl_strings = 20230125, absl_str_format = 20230125, absl_time =
>> 20230125, absl_span contains an operation using the old override syntax.
>> Please convert this layer/metadata before attempting to use with a newer
>> bitbake.
>>
>> Do you have this change in your build?
>> https://lists.openembedded.org/g/openembedded-core/message/179019
>>
>
> No, thanks for pointing out this fix, I have proposed a backport to
> kirkstone.
>
> Regards,
> Clement
>
>
>>
>> On Thu, Jul 20, 2023 at 6:25 PM Clément Péron <peron.clem@gmail.com>
>> wrote:
>>
>>> Hi,
>>>
>>> I'm trying to bump gRPC to a more recent version,
>>> but it requires a bump of protobuf.
>>>
>>> I'm strugling with the following issue when compiling:
>>>
>>> ERROR: abseil-cpp-20230125.3-r0 do_package: Variable Requires:
>>> absl_config = 20230125, absl_core_headers = 20230125,
>>> absl_log_internal_append_truncated = 20230125, absl_log_internal_config =
>>> 20230125, absl_log_internal_globals = 20230125, absl_log_severity =
>>> 20230125, absl_strings = 20230125, absl_str_format = 20230125, absl_time =
>>> 20230125, absl_span contains an operation using the old override syntax.
>>> Please convert this layer/metadata before attempting to use with a newer
>>> bitbake.
>>> ERROR: Logfile of failure stored in:
>>> /build/tmp/work/armv8a-poky-linux/abseil-cpp/20230125.3-r0/temp/log.do_package.2192204
>>> ERROR: Task
>>> (/build/../meta-outsight/recipes-devtools/abseil-cpp/abseil-cpp_git.bb:do_package)
>>> failed with exit code '1'
>>>
>>> Do you have an idea of what is happening?
>>
>>
I'm now facing the issue that /usr/lib/libutf8_validity.a is installed by
both utf8-range-native and protobuf-native.
I'm not an expert but is it not kind of strange that a python package ships
a library in /usr/lib no? I would expect it to be used at link time but not
shipped. Am I correct?
https://github.com/protocolbuffers/protobuf/blob/main/python/setup.py#L309
Regards,
Clement
>
>>> Thanks for your help
>>>
>>> Clément Péron (4):
>>> jsoncpp: extend with nativesdk
>>> devtools: protobuf: add utf8-range recipe
>>> protobuf: bump to 3.23.4
>>> devtools: grpc: bump to 1.56.2
>>>
>>> ...RPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch | 62 -------------
>>> ...d-separate-export-for-plugin-targets.patch | 93 -------------------
>>> .../grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb} | 6 +-
>>> .../recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb | 2 +-
>>> .../0001-Fix-linking-error-with-ld-gold.patch | 69 --------------
>>> ...e-respect-CXX-LDFLAGS-variables-fix-.patch | 4 +-
>>> ...protobuf_3.21.12.bb => protobuf_3.23.4.bb} | 8 +-
>>> .../protobuf/utf8-range_git.bb | 22 +++++
>>> 8 files changed, 32 insertions(+), 234 deletions(-)
>>> delete mode 100644
>>> meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch
>>> delete mode 100644
>>> meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
>>> rename meta-oe/recipes-devtools/grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb}
>>> (92%)
>>> delete mode 100644
>>> meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch
>>> rename meta-oe/recipes-devtools/protobuf/{protobuf_3.21.12.bb =>
>>> protobuf_3.23.4.bb} (95%)
>>> create mode 100644 meta-oe/recipes-devtools/protobuf/utf8-range_git.bb
>>>
>>> --
>>> 2.41.0
>>>
>>>
>>>
>>>
>>>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184677):
> https://lists.openembedded.org/g/openembedded-core/message/184677
> Mute This Topic: https://lists.openembedded.org/mt/100259348/4240582
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> peron.clem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
[-- Attachment #2: Type: text/html, Size: 8622 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread