From bdff8df409696288f1de5f7919dbfe59a2ea7894 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 14 Jan 2026 10:00:06 -0800 Subject: grpc: Upgrade to 1.76.0 Backport a fix to build with latest gcc and clang Signed-off-by: Khem Raj --- .../0001-build-add-missing-includes-41351.patch | 58 ++++++++++++++++++ meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb | 68 --------------------- meta-oe/recipes-devtools/grpc/grpc_1.76.0.bb | 69 ++++++++++++++++++++++ 3 files changed, 127 insertions(+), 68 deletions(-) create mode 100644 meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch delete mode 100644 meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb create mode 100644 meta-oe/recipes-devtools/grpc/grpc_1.76.0.bb diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch new file mode 100644 index 0000000000..bf1f22b906 --- /dev/null +++ b/meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch @@ -0,0 +1,58 @@ +From a976f66ac7d1b9f43a3071e22b5014fcfeab04b3 Mon Sep 17 00:00:00 2001 +From: "Mark D. Roth" +Date: Tue, 6 Jan 2026 10:09:45 -0800 +Subject: [PATCH] [build] add missing includes (#41351) + +Fixes #41305. + +Closes #41351 + +COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/41351 from markdroth:add_missing_includes 223be6932adb00d085149c53167c1b0318745f6c +PiperOrigin-RevId: 852829597 + +Upstream-Status: Backport [https://github.com/grpc/grpc/commit/d54219b508423f0a2ff6a0b98c16fb6dafd44b84] +Signed-off-by: Khem Raj +--- + include/grpc/event_engine/memory_request.h | 2 ++ + src/core/channelz/v2tov1/property_list.cc | 1 + + src/core/util/glob.cc | 2 ++ + 3 files changed, 5 insertions(+) + +diff --git a/include/grpc/event_engine/memory_request.h b/include/grpc/event_engine/memory_request.h +index 76bcbb2036..ad8cab842e 100644 +--- a/include/grpc/event_engine/memory_request.h ++++ b/include/grpc/event_engine/memory_request.h +@@ -17,6 +17,8 @@ + #include + #include + ++#include ++ + #include "absl/strings/string_view.h" + + namespace grpc_event_engine { +diff --git a/src/core/channelz/v2tov1/property_list.cc b/src/core/channelz/v2tov1/property_list.cc +index 64bbb6307c..03367cce7c 100644 +--- a/src/core/channelz/v2tov1/property_list.cc ++++ b/src/core/channelz/v2tov1/property_list.cc +@@ -15,6 +15,7 @@ + #include "src/core/channelz/v2tov1/property_list.h" + + #include ++#include + #include + #include + +diff --git a/src/core/util/glob.cc b/src/core/util/glob.cc +index 1b1c16e23d..22e54259f0 100644 +--- a/src/core/util/glob.cc ++++ b/src/core/util/glob.cc +@@ -12,6 +12,8 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + ++#include ++ + #include "absl/strings/string_view.h" + + namespace grpc_core { diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb b/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb deleted file mode 100644 index 53867b8fe6..0000000000 --- a/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb +++ /dev/null @@ -1,68 +0,0 @@ -DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ -Provides gRPC libraries for multiple languages written on top of shared C core library \ -(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" -HOMEPAGE = "https://github.com/grpc/grpc" -SECTION = "libs" -LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0 & MIT & BSD-2-Clause" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906 \ - file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \ - file://third_party/xxhash/LICENSE;md5=cdfe7764d5685d8e08b3df302885d7f3 \ -" - -DEPENDS = "abseil-cpp c-ares openssl protobuf protobuf-native re2 zlib" -DEPENDS:append:class-target = " grpc-native" -DEPENDS:append:class-nativesdk = " grpc-native " - -PACKAGE_BEFORE_PN = "${PN}-compiler" - -RDEPENDS:${PN}-compiler = "${PN}" -RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" -# Configuration above allows to cross-compile gRPC applications -# In order to compile applications on the target, use the dependency below -# Both dependencies are mutually exclusive -# RDEPENDS:${PN}-dev += "${PN}-compiler" - -SRCREV_grpc = "4e9357bca1408596663a218c0c608a4c0560a867" -BRANCH = "v1.71.x" -SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ - file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ - " - -inherit cmake pkgconfig - -EXTRA_OECMAKE = " \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/protoc \ - -DgRPC_ABSL_PROVIDER=package \ - -DgRPC_RE2_PROVIDER=package \ - -DgRPC_INSTALL=ON \ - -DCMAKE_CROSSCOMPILING=ON \ - -DgRPC_INSTALL_LIBDIR=${baselib} \ - -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ - " - -PACKAGECONFIG ??= "cpp shared" -PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" -PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" -PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" -PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" -PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" -PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" -PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" -PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF" -PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," - -do_configure:prepend() { - sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt -} - -BBCLASSEXTEND = "native nativesdk" - -FILES:${PN}-compiler += " \ - ${bindir} \ - ${libdir}/libgrpc_plugin_support${SOLIBS} \ - " diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.76.0.bb b/meta-oe/recipes-devtools/grpc/grpc_1.76.0.bb new file mode 100644 index 0000000000..39c9fb98de --- /dev/null +++ b/meta-oe/recipes-devtools/grpc/grpc_1.76.0.bb @@ -0,0 +1,69 @@ +DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ +Provides gRPC libraries for multiple languages written on top of shared C core library \ +(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" +HOMEPAGE = "https://github.com/grpc/grpc" +SECTION = "libs" +LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0 & MIT & BSD-2-Clause" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906 \ + file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \ + file://third_party/xxhash/LICENSE;md5=cdfe7764d5685d8e08b3df302885d7f3 \ +" + +DEPENDS = "abseil-cpp c-ares openssl protobuf protobuf-native re2 zlib" +DEPENDS:append:class-target = " grpc-native" +DEPENDS:append:class-nativesdk = " grpc-native " + +PACKAGE_BEFORE_PN = "${PN}-compiler" + +RDEPENDS:${PN}-compiler = "${PN}" +RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" +# Configuration above allows to cross-compile gRPC applications +# In order to compile applications on the target, use the dependency below +# Both dependencies are mutually exclusive +# RDEPENDS:${PN}-dev += "${PN}-compiler" + +SRCREV = "f5ffb68d8a2fd603dff16287e90a4ac571e1fec6" +BRANCH = "v1.76.x" +SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH};tag=v${PV} \ + file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ + file://0001-build-add-missing-includes-41351.patch \ + " + +inherit cmake pkgconfig + +EXTRA_OECMAKE = " \ + -DgRPC_CARES_PROVIDER=package \ + -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_SSL_PROVIDER=package \ + -DgRPC_PROTOBUF_PROVIDER=package \ + -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/protoc \ + -DgRPC_ABSL_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ + -DgRPC_INSTALL=ON \ + -DCMAKE_CROSSCOMPILING=ON \ + -DgRPC_INSTALL_LIBDIR=${baselib} \ + -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ + " + +PACKAGECONFIG ??= "cpp shared" +PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" +PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" +PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" +PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" +PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" +PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" +PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" +PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," + +do_configure:prepend() { + sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt +} + +BBCLASSEXTEND = "native nativesdk" + +FILES:${PN}-compiler += " \ + ${bindir} \ + ${libdir}/libgrpc_plugin_support${SOLIBS} \ + " -- cgit v1.2.3-54-g00ecf