!52 [FIX] fix the adaptation to grpc-1.54.2

From: @dguangya 
Reviewed-by: @wumingchuan 
Signed-off-by: @wumingchuan
This commit is contained in:
openeuler-ci-bot 2023-08-14 08:08:36 +00:00 committed by Gitee
commit 25c7020d10
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 52 additions and 1 deletions

View File

@ -0,0 +1,44 @@
From 33aad2ac03adb20a71c430d5daa2ee52a6a96480 Mon Sep 17 00:00:00 2001
From: dingguangya <dingguangya1@huawei.com>
Date: Mon, 14 Aug 2023 14:45:31 +0800
Subject: [PATCH] [Pin-server] fix the adaptation to grpc-1.54.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a72863..df8b634 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,8 @@ add_library(plg_grpc_proto STATIC
${plg_proto_srcs}
${plg_proto_hdrs})
target_link_libraries(plg_grpc_proto
+ ${GRPC_LIBRARY}
+ ${GPR_LIBRARY}
${GRPC_PP_REFLECTION_LIBRARY}
${GRPC_PP_LIBRARY}
${PROTOBUF_LIBRARY})
@@ -109,6 +111,8 @@ target_link_libraries(pin_server
pin_user
${JSONCPP_LIBRARY}
plg_grpc_proto
+ ${GRPC_LIBRARY}
+ ${GPR_LIBRARY}
${GRPC_PP_REFLECTION_LIBRARY}
${GRPC_PP_LIBRARY}
${PROTOBUF_LIBRARY}
diff --git a/cmake/common.cmake b/cmake/common.cmake
index cf48699..033d8c3 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -35,6 +35,8 @@ find_library(GRPC_PP_LIBRARY grpc++)
_CHECK(GRPC_PP_LIBRARY "GRPC_PP_LIBRARY-NOTFOUND" "libgrpc++.so")
find_library(GRPC_LIBRARY grpc)
_CHECK(GRPC_LIBRARY "GRPC_LIBRARY-NOTFOUND" "libgrpc.so")
+find_library(GPR_LIBRARY gpr)
+_CHECK(GPR_LIBRARY "GPR_LIBRARY-NOTFOUND" "libgpr.so")
# check abseil_synchronization
find_library(ABSEIL_SYNC_LIBRARY absl_synchronization)
--
2.33.0.windows.2

View File

@ -1,6 +1,6 @@
Name: pin-server
Version: 0.4.0
Release: 12
Release: 13
Summary: Pin (Plug-IN framework) server provides plugin APIs for compiler optimization developers to develop optimization pass.
License: Apache 2.0
URL: https://gitee.com/openeuler/pin-server
@ -39,6 +39,7 @@ Patch26: 0026-Pin-server-Fix-log-output-form.patch
Patch27: 0027-Pin-server-Optimized-LocalVarSummeryPass.patch
Patch28: 0028-Pin-server-Adaptation-to-llvm15-mlir15-only-solves-t.patch
Patch29: 0029-Pin-server-Adaptation-to-gcc12-only-solves-the-build.patch
Patch30: 0030-Pin-server-fix-the-adaptation-to-grpc-1.54.2.patch
%description
Pin (Plug-IN framework) server provides plugin APIs for compiler optimization developers to develop optimization pass.
@ -95,6 +96,12 @@ find %{_libdir} -type f -name "libMLIRServerAPI.so" -exec strip "{}" ";"
%config(noreplace) /etc/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
* Mon Aug 14 2023 dingguangya <dingguangya1@huawei.com> - 0.4.0-13
- Type:FIX
- ID:NA
- SUG:NA
- DESC:Fix the adaptation to grpc-1.54.2
* Thu Aug 3 2023 dingguangya <dingguangya1@huawei.com> - 0.4.0-12
- Type:FIX
- ID:NA