packages/iSulad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compile error with grpc 1.41.x

Browse Source 
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
This commit is contained in:
zhangxiaoyu 2022-01-12 16:12:15 +08:00
parent 1186a13712
commit 072ca900cf
2 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
0025-fix-compile-error-with-grpc-1.41.x.patch Normal file
View File

@ -0,0 +1,61 @@
From e24056c1c09eecace5197feb813fe29e19e30ede Mon Sep 17 00:00:00 2001
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
Date: Tue, 11 Jan 2022 10:00:37 +0800
Subject: [PATCH] fix compile error with grpc 1.41.x
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
---
cmake/checker.cmake | 2 ++
src/CMakeLists.txt | 9 +++++++++
2 files changed, 11 insertions(+)
diff --git a/cmake/checker.cmake b/cmake/checker.cmake
index 17a324f6..946ee730 100644
--- a/cmake/checker.cmake
+++ b/cmake/checker.cmake
@@ -147,6 +147,8 @@ if (GRPC_CONNECTOR OR ENABLE_OCI_IMAGE)
_CHECK(GRPC_LIBRARY "GRPC_LIBRARY-NOTFOUND" "libgrpc.so")
find_library(GPR_LIBRARY gpr)
_CHECK(GPR_LIBRARY "GPR_LIBRARY-NOTFOUND" "libgpr.so")
+ # no check
+ find_library(ABSL_SYNC_LIB absl_synchronization)
# check devmapper
find_path(DEVMAPPER_INCLUDE_DIR libdevmapper.h)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1401784b..30f451d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -95,6 +95,9 @@ if (GRPC_CONNECTOR)
target_link_libraries(libisula -Wl,--as-needed -lstdc++)
target_link_libraries(libisula -Wl,--as-needed ${PROTOBUF_LIBRARY})
target_link_libraries(libisula -Wl,--no-as-needed ${GRPC_PP_REFLECTION_LIBRARY} ${GRPC_PP_LIBRARY} ${GRPC_LIBRARY} ${GPR_LIBRARY})
+ if(ABSL_SYNC_LIB)
+ target_link_libraries(libisula -Wl,--no-as-needed ${ABSL_SYNC_LIB})
+ endif()
else()
target_link_libraries(libisula ${EVHTP_LIBRARY} ${EVENT_LIBRARY} ${ZLIB_LIBRARY} -ldl libhttpclient)
endif()
@@ -167,6 +170,9 @@ if (GRPC_CONNECTOR)
target_link_libraries(isulad -Wl,--as-needed -lstdc++)
target_link_libraries(isulad -Wl,--as-needed ${PROTOBUF_LIBRARY})
target_link_libraries(isulad -Wl,--no-as-needed ${GRPC_PP_REFLECTION_LIBRARY} ${GRPC_PP_LIBRARY} ${GRPC_LIBRARY} ${GPR_LIBRARY})
+ if(ABSL_SYNC_LIB)
+ target_link_libraries(isulad -Wl,--no-as-needed ${ABSL_SYNC_LIB})
+ endif()
target_link_libraries(isulad ${CLIBCNI_LIBRARY})
else()
message("Restful iSulad")
@@ -182,6 +188,9 @@ if (ENABLE_OCI_IMAGE)
target_link_libraries(isulad -Wl,--as-needed -ldevmapper)
target_link_libraries(isulad -Wl,--as-needed ${PROTOBUF_LIBRARY})
target_link_libraries(isulad -Wl,--no-as-needed ${GRPC_PP_REFLECTION_LIBRARY} ${GRPC_PP_LIBRARY} ${GRPC_LIBRARY} ${GPR_LIBRARY})
+ if(ABSL_SYNC_LIB)
+ target_link_libraries(isulad -Wl,--no-as-needed ${ABSL_SYNC_LIB})
+ endif()
endif()
if (ISULAD_GCOV)
--
2.25.1

9
iSulad.spec
View File

@ -1,5 +1,5 @@
%global _version 2.0.10
%global _release 13
%global _release 14
%global is_systemd 1
%global enable_shimv2 1
%global is_embedded 1
@ -37,6 +37,7 @@ Patch0021: 0021-Fixed-a-bug-that-occurs-when-starting-container-in-h.patch
Patch0022: 0022-fix-memory-leak-in-CniNetworkPlugin.patch
Patch0023: 0023-fix-codex-error.patch
Patch0024: 0024-fix-compile-error-when-building-embedded-image.patch
Patch0025: 0025-fix-compile-error-with-grpc-1.41.x.patch
%ifarch x86_64 aarch64
Provides: libhttpclient.so()(64bit)
@ -261,6 +262,12 @@ fi
%endif
%changelog
* Wed Jan 12 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.10-14
- Type: bugfix
- ID: NA
- SUG: NA
- DESC: fix compile error with grpc 1.41.x
* Tue Jan 4 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.10-13
- Type: bugfix
- ID: NA