You can not select more than 25 topics Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.

grpc.patch001 5.9 kB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148
  1. diff -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()
  33. diff -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()
  65. diff -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. +set_target_properties(address_sorting PROPERTIES OUTPUT_NAME mindspore_address_sorting)
  72. +
  73. if(WIN32 AND MSVC)
  74. set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting"
  75. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  76. @@ -1404,6 +1406,8 @@ set_target_properties(gpr PROPERTIES
  77. SOVERSION ${gRPC_CORE_SOVERSION}
  78. )
  79. +set_target_properties(gpr PROPERTIES OUTPUT_NAME mindspore_gpr)
  80. +
  81. if(WIN32 AND MSVC)
  82. set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
  83. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  84. @@ -1869,6 +1873,8 @@ set_target_properties(grpc PROPERTIES
  85. SOVERSION ${gRPC_CORE_SOVERSION}
  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. @@ -3696,6 +3702,8 @@ set_target_properties(grpc++ PROPERTIES
  93. SOVERSION ${gRPC_CPP_SOVERSION}
  94. )
  95. +set_target_properties(grpc++ PROPERTIES OUTPUT_NAME mindspore_grpc++)
  96. +
  97. if(WIN32 AND MSVC)
  98. set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
  99. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  100. @@ -4279,6 +4287,8 @@ set_target_properties(grpc++_reflection
  101. SOVERSION ${gRPC_CPP_SOVERSION}
  102. )
  103. +set_target_properties(grpc++_reflection PROPERTIES OUTPUT_NAME mindspore_grpc++_reflection)
  104. +
  105. if(WIN32 AND MSVC)
  106. set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
  107. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  108. @@ -5896,6 +5906,8 @@ set_target_properties(upb PROPERTIES
  109. SOVERSION ${gRPC_CORE_SOVERSION}
  110. )
  111. +set_target_properties(upb PROPERTIES OUTPUT_NAME mindspore_upb)
  112. +
  113. if(WIN32 AND MSVC)
  114. set_target_properties(upb PROPERTIES COMPILE_PDB_NAME "upb"
  115. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  116. @@ -12992,7 +13004,13 @@ if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRP
  117. add_executable(grpc_cpp_plugin
  118. src/compiler/cpp_plugin.cc
  119. )
  120. -
  121. +if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
  122. + set(CMAKE_MACOSX_RPATH 1)
  123. + set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
  124. + set_target_properties(grpc_cpp_plugin PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_RPATH}")
  125. +else()
  126. + set_target_properties(grpc_cpp_plugin PROPERTIES INSTALL_RPATH $ORIGIN/../lib)
  127. +endif()
  128. target_include_directories(grpc_cpp_plugin
  129. PRIVATE
  130. ${CMAKE_CURRENT_SOURCE_DIR}
  131. diff -Npur grpc/cmake/cares.cmake grpc-patch/cmake/cares.cmake
  132. --- grpc/cmake/cares.cmake 2020-02-27 03:12:33.000000000 +0800
  133. +++ grpc-patch/cmake/cares.cmake 2021-04-22 21:05:06.398251400 +0800
  134. @@ -39,7 +39,7 @@ if(gRPC_CARES_PROVIDER STREQUAL "module"
  135. set(gRPC_INSTALL FALSE)
  136. endif()
  137. elseif(gRPC_CARES_PROVIDER STREQUAL "package")
  138. - find_package(c-ares 1.13.0 REQUIRED)
  139. + find_package(c-ares REQUIRED) # cmake 3.19+ cannot find cares 1.15.0
  140. if(TARGET c-ares::cares)
  141. set(_gRPC_CARES_LIBRARIES c-ares::cares)
  142. endif()