Browse Source

fix compile error on libevent and grpc

Signed-off-by: zhoufeng <zhoufeng54@huawei.com>
pull/14918/head
zhoufeng 5 years ago
parent
commit
534fa9bb6c
3 changed files with 14 additions and 1 deletions
  1. +1
    -1
      cmake/external_libs/libevent.cmake
  2. +1
    -0
      cmake/external_libs/openssl.cmake
  3. +12
    -0
      third_party/patch/grpc/grpc.patch001

+ 1
- 1
cmake/external_libs/libevent.cmake View File

@@ -1,6 +1,6 @@
set(libevent_CFLAGS "-fstack-protector-all -D_FORTIFY_SOURCE=2 -O2")
if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
set(libevent_LDFLAGS "-Wl,-z,now")
set(libevent_LDFLAGS "-Wl,-z,now -ldl")
endif()

if(ENABLE_GITEE)


+ 1
- 0
cmake/external_libs/openssl.cmake View File

@@ -11,3 +11,4 @@ mindspore_add_pkg(openssl
URL ${REQ_URL}
MD5 ${MD5}
CONFIGURE_COMMAND ./config no-zlib no-shared)
include_directories(${openssl_INC})

+ 12
- 0
third_party/patch/grpc/grpc.patch001 View File

@@ -10,3 +10,15 @@ diff -Npur grpc/CMakeLists.txt grpc-patch/CMakeLists.txt
target_include_directories(grpc_cpp_plugin
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
diff -Npur grpc/cmake/cares.cmake grpc-patch/cmake/cares.cmake
--- grpc/cmake/cares.cmake 2020-02-27 03:12:33.000000000 +0800
+++ grpc-patch/cmake/cares.cmake 2021-04-10 14:22:35.895725700 +0800
@@ -39,7 +39,7 @@ if(gRPC_CARES_PROVIDER STREQUAL "module"
set(gRPC_INSTALL FALSE)
endif()
elseif(gRPC_CARES_PROVIDER STREQUAL "package")
- find_package(c-ares 1.13.0 REQUIRED)
+ find_package(c-ares REQUIRED) # cmake 3.19+ cannot find cares 1.15.0
if(TARGET c-ares::cares)
set(_gRPC_CARES_LIBRARIES c-ares::cares)
endif()

Loading…
Cancel
Save