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