diff options
| -rw-r--r-- | meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch | 10 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb (renamed from meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb) | 4 |
2 files changed, 7 insertions, 7 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 fbdf06d692..594503ae2a 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 c321f19ff1cd1251c19d20b17a2d86c4237ce506 Mon Sep 17 00:00:00 2001 | 1 | From 54e8dca9b39b8c8a6532576a0286e548f97607fa 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 |
| @@ -15,12 +15,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 15 | 1 file changed, 3 insertions(+) | 15 | 1 file changed, 3 insertions(+) |
| 16 | 16 | ||
| 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 18 | index b272816685..e1fe1102c4 100644 | 18 | index 06e6453b5c..476d7f1576 100644 |
| 19 | --- a/CMakeLists.txt | 19 | --- a/CMakeLists.txt |
| 20 | +++ b/CMakeLists.txt | 20 | +++ b/CMakeLists.txt |
| 21 | @@ -303,6 +303,9 @@ if(UNIX AND NOT HAIKU) | 21 | @@ -306,6 +306,9 @@ if(UNIX AND NOT HAIKU) |
| 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() | 24 | endif() |
| 25 | + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") | 25 | + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") |
| 26 | + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} atomic) | 26 | + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} atomic) |
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb b/meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb index c30e52263d..14fca669d3 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.60.0.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 = "883e5f76976b86afee87415dc67bde58d9b295a4" | 23 | SRCREV_grpc = "0ef13a7555dbaadd4633399242524129eef5e231" |
| 24 | BRANCH = "v1.59.x" | 24 | BRANCH = "v1.60.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 | " |
