Skip to content

Commit 15cff67

Browse files
weltlingkraj
authored andcommitted
grpc: Upgrade 1.24.3 -> 1.35.0
This is a really huge jump in versions, but this package has been not upgraded for quite some time. The previous patches are not necessary anymore, they're integrated upstream. Signed-off-by: Anatol Belski <[email protected]> Signed-off-by: Khem Raj <[email protected]>
1 parent 1f1f01c commit 15cff67

File tree

3 files changed

+5
-232
lines changed

3 files changed

+5
-232
lines changed

meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch

Lines changed: 0 additions & 45 deletions
This file was deleted.

meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch

Lines changed: 0 additions & 177 deletions
This file was deleted.

meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb renamed to meta-oe/recipes-devtools/grpc/grpc_1.35.0.bb

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,15 @@ SECTION = "libs"
66
LICENSE = "Apache-2"
77
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
88

9-
DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2"
9+
DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2"
1010
DEPENDS_append_class-target = " googletest grpc-native "
1111
DEPENDS_append_class-nativesdk = " grpc-native "
1212

1313
S = "${WORKDIR}/git"
14-
SRCREV_grpc = "2de2e8dd8921e1f7d043e01faf7fe8a291fbb072"
15-
SRCREV_upb = "9effcbcb27f0a665f9f345030188c0b291e32482"
16-
BRANCH = "v1.24.x"
14+
SRCREV_grpc = "627a22541a1836ce00cdc40a3977aa8928de98bc"
15+
BRANCH = "v1.35.x"
1716
SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \
18-
git://github.com/protocolbuffers/upb;name=upb;destsuffix=git/third_party/upb \
19-
file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \
2017
"
21-
SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch \
22-
"
23-
SRC_URI_append_class-nativesdk = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch"
24-
2518
# Fixes build with older compilers 4.8 especially on ubuntu 14.04
2619
CXXFLAGS_append_class-native = " -Wl,--no-as-needed"
2720

@@ -33,6 +26,8 @@ EXTRA_OECMAKE = " \
3326
-DgRPC_SSL_PROVIDER=package \
3427
-DgRPC_PROTOBUF_PROVIDER=package \
3528
-DgRPC_GFLAGS_PROVIDER=package \
29+
-DgRPC_ABSL_PROVIDER=package \
30+
-DgRPC_RE2_PROVIDER=package \
3631
-DgRPC_INSTALL=ON \
3732
-DCMAKE_CROSSCOMPILING=ON \
3833
-DBUILD_SHARED_LIBS=ON \

0 commit comments

Comments
 (0)