• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff -Npur grpc/..rej grpc-patch/..rej
2--- grpc/..rej	1970-01-01 08:00:00.000000000 +0800
3+++ grpc-patch/..rej	2021-04-22 21:00:17.343178600 +0800
4@@ -0,0 +1,22 @@
5+--- CMakeLists.txt	2020-02-27 03:12:33.000000000 +0800
6++++ CMakeLists.txt	2021-04-07 21:27:12.317207600 +0800
7+@@ -12992,7 +12992,7 @@ if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRP
8+ add_executable(grpc_cpp_plugin
9+   src/compiler/cpp_plugin.cc
10+ )
11+-
12++set_target_properties(grpc_cpp_plugin PROPERTIES INSTALL_RPATH $ORIGIN/../lib)
13+ target_include_directories(grpc_cpp_plugin
14+   PRIVATE
15+     ${CMAKE_CURRENT_SOURCE_DIR}
16+--- cmake/cares.cmake	2020-02-27 03:12:33.000000000 +0800
17++++ cmake/cares.cmake	2021-04-10 14:22:35.895725700 +0800
18+@@ -39,7 +39,7 @@ if(gRPC_CARES_PROVIDER STREQUAL "module"
19+     set(gRPC_INSTALL FALSE)
20+   endif()
21+ elseif(gRPC_CARES_PROVIDER STREQUAL "package")
22+-  find_package(c-ares 1.13.0 REQUIRED)
23++  find_package(c-ares REQUIRED) # cmake 3.19+ cannot find cares 1.15.0
24+   if(TARGET c-ares::cares)
25+     set(_gRPC_CARES_LIBRARIES c-ares::cares)
26+   endif()
27diff -Npur grpc/.rej grpc-patch/.rej
28--- grpc/.rej	1970-01-01 08:00:00.000000000 +0800
29+++ grpc-patch/.rej	2021-04-22 21:03:38.192349100 +0800
30@@ -0,0 +1,22 @@
31+--- grpc/CMakeLists.txt	2020-02-27 03:12:33.000000000 +0800
32++++ grpc-patch/CMakeLists.txt	2021-04-07 21:27:12.317207600 +0800
33+@@ -12992,7 +12992,7 @@ if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRP
34+ add_executable(grpc_cpp_plugin
35+   src/compiler/cpp_plugin.cc
36+ )
37+-
38++set_target_properties(grpc_cpp_plugin PROPERTIES INSTALL_RPATH $ORIGIN/../lib)
39+ target_include_directories(grpc_cpp_plugin
40+   PRIVATE
41+     ${CMAKE_CURRENT_SOURCE_DIR}
42+--- grpc/cmake/cares.cmake	2020-02-27 03:12:33.000000000 +0800
43++++ grpc-patch/cmake/cares.cmake	2021-04-10 14:22:35.895725700 +0800
44+@@ -39,7 +39,7 @@ if(gRPC_CARES_PROVIDER STREQUAL "module"
45+     set(gRPC_INSTALL FALSE)
46+   endif()
47+ elseif(gRPC_CARES_PROVIDER STREQUAL "package")
48+-  find_package(c-ares 1.13.0 REQUIRED)
49++  find_package(c-ares REQUIRED) # cmake 3.19+ cannot find cares 1.15.0
50+   if(TARGET c-ares::cares)
51+     set(_gRPC_CARES_LIBRARIES c-ares::cares)
52+   endif()
53diff -Npur grpc/CMakeLists.txt grpc-patch/CMakeLists.txt
54--- grpc/CMakeLists.txt	2020-02-27 03:12:33.000000000 +0800
55+++ grpc-patch/CMakeLists.txt	2021-04-22 21:15:04.458188400 +0800
56@@ -936,6 +936,8 @@ set_target_properties(address_sorting PR
57   SOVERSION ${gRPC_CORE_SOVERSION}
58 )
59
60+set_target_properties(address_sorting PROPERTIES OUTPUT_NAME mindspore_address_sorting)
61+
62 if(WIN32 AND MSVC)
63   set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting"
64     COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
65@@ -1404,6 +1406,8 @@ set_target_properties(gpr PROPERTIES
66   SOVERSION ${gRPC_CORE_SOVERSION}
67 )
68
69+set_target_properties(gpr PROPERTIES OUTPUT_NAME mindspore_gpr)
70+
71 if(WIN32 AND MSVC)
72   set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
73     COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
74@@ -1869,6 +1873,8 @@ set_target_properties(grpc PROPERTIES
75   SOVERSION ${gRPC_CORE_SOVERSION}
76 )
77
78+set_target_properties(grpc PROPERTIES OUTPUT_NAME mindspore_grpc)
79+
80 if(WIN32 AND MSVC)
81   set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
82     COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
83@@ -3696,6 +3702,8 @@ set_target_properties(grpc++ PROPERTIES
84   SOVERSION ${gRPC_CPP_SOVERSION}
85 )
86
87+set_target_properties(grpc++ PROPERTIES OUTPUT_NAME mindspore_grpc++)
88+
89 if(WIN32 AND MSVC)
90   set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
91     COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
92@@ -4279,6 +4287,8 @@ set_target_properties(grpc++_reflection
93   SOVERSION ${gRPC_CPP_SOVERSION}
94 )
95
96+set_target_properties(grpc++_reflection PROPERTIES OUTPUT_NAME mindspore_grpc++_reflection)
97+
98 if(WIN32 AND MSVC)
99   set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
100     COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
101@@ -5896,6 +5906,8 @@ set_target_properties(upb PROPERTIES
102   SOVERSION ${gRPC_CORE_SOVERSION}
103 )
104
105+set_target_properties(upb PROPERTIES OUTPUT_NAME mindspore_upb)
106+
107 if(WIN32 AND MSVC)
108   set_target_properties(upb PROPERTIES COMPILE_PDB_NAME "upb"
109     COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
110@@ -12992,7 +13004,7 @@ if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRP
111 add_executable(grpc_cpp_plugin
112   src/compiler/cpp_plugin.cc
113 )
114-
115+set_target_properties(grpc_cpp_plugin PROPERTIES INSTALL_RPATH $ORIGIN/../lib)
116 target_include_directories(grpc_cpp_plugin
117   PRIVATE
118     ${CMAKE_CURRENT_SOURCE_DIR}
119diff -Npur grpc/cmake/cares.cmake grpc-patch/cmake/cares.cmake
120--- grpc/cmake/cares.cmake	2020-02-27 03:12:33.000000000 +0800
121+++ grpc-patch/cmake/cares.cmake	2021-04-22 21:05:06.398251400 +0800
122@@ -39,7 +39,7 @@ if(gRPC_CARES_PROVIDER STREQUAL "module"
123     set(gRPC_INSTALL FALSE)
124   endif()
125 elseif(gRPC_CARES_PROVIDER STREQUAL "package")
126-  find_package(c-ares 1.13.0 REQUIRED)
127+  find_package(c-ares REQUIRED) # cmake 3.19+ cannot find cares 1.15.0
128   if(TARGET c-ares::cares)
129     set(_gRPC_CARES_LIBRARIES c-ares::cares)
130   endif()
131