diff --git a/0027-remove-ABSL_SYNC_LIB-dependence.patch b/0027-remove-ABSL_SYNC_LIB-dependence.patch new file mode 100644 index 0000000000000000000000000000000000000000..1ed62f638b57beb9410217abd0488803aeecb90d --- /dev/null +++ b/0027-remove-ABSL_SYNC_LIB-dependence.patch @@ -0,0 +1,68 @@ +From 22a4fe94aa4ad66dfc692e2249b79231cc784090 Mon Sep 17 00:00:00 2001 +From: zhangxiaoyu +Date: Sat, 26 Feb 2022 17:47:13 +0800 +Subject: [PATCH] remove ABSL_SYNC_LIB dependence + +Signed-off-by: zhangxiaoyu +--- + cmake/checker.cmake | 2 -- + src/CMakeLists.txt | 16 ---------------- + 2 files changed, 18 deletions(-) + +diff --git a/cmake/checker.cmake b/cmake/checker.cmake +index 946ee73..17a324f 100644 +--- a/cmake/checker.cmake ++++ b/cmake/checker.cmake +@@ -147,8 +147,6 @@ 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 30f451d..ce491cb 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -95,9 +95,6 @@ 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() +@@ -170,9 +167,6 @@ 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") +@@ -183,16 +177,6 @@ if (GRPC_CONNECTOR AND ENABLE_METRICS) + target_link_libraries(isulad ${EVHTP_LIBRARY} ${EVENT_LIBRARY}) + endif() + +-if (ENABLE_OCI_IMAGE) +- target_link_libraries(isulad -Wl,--as-needed -lstdc++) +- 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) + target_link_libraries(isula -lgcov) + target_link_libraries(libisula -lgcov) +-- +2.25.1 + diff --git a/iSulad.spec b/iSulad.spec index 483f0ec267ebacd4531cf18b783c15fe7d07c629..d61ae313c546f52c7078c78917c1917a07fcdfb2 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.0.10 -%global _release 15 +%global _release 16 %global is_systemd 1 %global enable_shimv2 1 %global is_embedded 1 @@ -39,6 +39,7 @@ 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 Patch0026: 0026-fix-compile-error-of-isula-transform.patch +Patch0027: 0027-remove-ABSL_SYNC_LIB-dependence.patch %ifarch x86_64 aarch64 Provides: libhttpclient.so()(64bit)