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.1 kB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130
  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,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()
  27. diff -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()
  53. diff -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. +set_target_properties(address_sorting PROPERTIES OUTPUT_NAME mindspore_address_sorting)
  60. +
  61. if(WIN32 AND MSVC)
  62. set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting"
  63. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  64. @@ -1404,6 +1406,8 @@ set_target_properties(gpr PROPERTIES
  65. SOVERSION ${gRPC_CORE_SOVERSION}
  66. )
  67. +set_target_properties(gpr PROPERTIES OUTPUT_NAME mindspore_gpr)
  68. +
  69. if(WIN32 AND MSVC)
  70. set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
  71. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  72. @@ -1869,6 +1873,8 @@ set_target_properties(grpc PROPERTIES
  73. SOVERSION ${gRPC_CORE_SOVERSION}
  74. )
  75. +set_target_properties(grpc PROPERTIES OUTPUT_NAME mindspore_grpc)
  76. +
  77. if(WIN32 AND MSVC)
  78. set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
  79. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  80. @@ -3696,6 +3702,8 @@ set_target_properties(grpc++ PROPERTIES
  81. SOVERSION ${gRPC_CPP_SOVERSION}
  82. )
  83. +set_target_properties(grpc++ PROPERTIES OUTPUT_NAME mindspore_grpc++)
  84. +
  85. if(WIN32 AND MSVC)
  86. set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
  87. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  88. @@ -4279,6 +4287,8 @@ set_target_properties(grpc++_reflection
  89. SOVERSION ${gRPC_CPP_SOVERSION}
  90. )
  91. +set_target_properties(grpc++_reflection PROPERTIES OUTPUT_NAME mindspore_grpc++_reflection)
  92. +
  93. if(WIN32 AND MSVC)
  94. set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
  95. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  96. @@ -5896,6 +5906,8 @@ set_target_properties(upb PROPERTIES
  97. SOVERSION ${gRPC_CORE_SOVERSION}
  98. )
  99. +set_target_properties(upb PROPERTIES OUTPUT_NAME mindspore_upb)
  100. +
  101. if(WIN32 AND MSVC)
  102. set_target_properties(upb PROPERTIES COMPILE_PDB_NAME "upb"
  103. COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
  104. @@ -12992,7 +13004,7 @@ if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRP
  105. add_executable(grpc_cpp_plugin
  106. src/compiler/cpp_plugin.cc
  107. )
  108. -
  109. +set_target_properties(grpc_cpp_plugin PROPERTIES INSTALL_RPATH $ORIGIN/../lib)
  110. target_include_directories(grpc_cpp_plugin
  111. PRIVATE
  112. ${CMAKE_CURRENT_SOURCE_DIR}
  113. diff -Npur grpc/cmake/cares.cmake grpc-patch/cmake/cares.cmake
  114. --- grpc/cmake/cares.cmake 2020-02-27 03:12:33.000000000 +0800
  115. +++ grpc-patch/cmake/cares.cmake 2021-04-22 21:05:06.398251400 +0800
  116. @@ -39,7 +39,7 @@ if(gRPC_CARES_PROVIDER STREQUAL "module"
  117. set(gRPC_INSTALL FALSE)
  118. endif()
  119. elseif(gRPC_CARES_PROVIDER STREQUAL "package")
  120. - find_package(c-ares 1.13.0 REQUIRED)
  121. + find_package(c-ares REQUIRED) # cmake 3.19+ cannot find cares 1.15.0
  122. if(TARGET c-ares::cares)
  123. set(_gRPC_CARES_LIBRARIES c-ares::cares)
  124. endif()