diff options
-rw-r--r-- | meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb (renamed from meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb) | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch index c2afd4a92e..fbdf06d692 100644 --- a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch +++ b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 592a4aaba20818bcff9a1448c34b09aff9e0d2e9 Mon Sep 17 00:00:00 2001 | 1 | From c321f19ff1cd1251c19d20b17a2d86c4237ce506 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 19 Apr 2022 16:07:19 -0700 | 3 | Date: Tue, 19 Apr 2022 16:07:19 -0700 |
4 | Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 | 4 | Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 |
@@ -9,15 +9,16 @@ riscv64-yoe-linux-musl/12.0.1/ld: libgrpc.so.23.0.0: undefined reference to `__a | |||
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | CMakeLists.txt | 3 +++ | 14 | CMakeLists.txt | 3 +++ |
14 | 1 file changed, 3 insertions(+) | 15 | 1 file changed, 3 insertions(+) |
15 | 16 | ||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
17 | index a8fd3bf37b3..9f5b242683d 100644 | 18 | index b272816685..e1fe1102c4 100644 |
18 | --- a/CMakeLists.txt | 19 | --- a/CMakeLists.txt |
19 | +++ b/CMakeLists.txt | 20 | +++ b/CMakeLists.txt |
20 | @@ -303,6 +303,9 @@ if(UNIX) | 21 | @@ -303,6 +303,9 @@ if(UNIX AND NOT HAIKU) |
21 | if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) | 22 | if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) |
22 | set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} rt) | 23 | set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} rt) |
23 | endif() | 24 | endif() |
@@ -26,7 +27,4 @@ index a8fd3bf37b3..9f5b242683d 100644 | |||
26 | + endif() | 27 | + endif() |
27 | endif() | 28 | endif() |
28 | 29 | ||
29 | # configure ccache if requested | 30 | include(CheckCXXSourceCompiles) |
30 | -- | ||
31 | 2.36.0 | ||
32 | |||
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb b/meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb index c4dd6b9857..c30e52263d 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb | |||
@@ -20,8 +20,8 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" | |||
20 | # RDEPENDS:${PN}-dev += "${PN}-compiler" | 20 | # RDEPENDS:${PN}-dev += "${PN}-compiler" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | SRCREV_grpc = "c0d1c393d9365664d47df41746e992ae97b651ef" | 23 | SRCREV_grpc = "883e5f76976b86afee87415dc67bde58d9b295a4" |
24 | BRANCH = "v1.56.x" | 24 | BRANCH = "v1.59.x" |
25 | SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ | 25 | SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ |
26 | file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ | 26 | file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ |
27 | " | 27 | " |