You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/06/11 20:49:34 UTC

[arrow] branch master updated: ARROW-16788: [C++] Remove hardening flags gRPC doesn't support (#13346)

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 4c3f96b0f2 ARROW-16788: [C++] Remove hardening flags gRPC doesn't support (#13346)
4c3f96b0f2 is described below

commit 4c3f96b0f22588565b37d64c290b28fac6039f54
Author: David Li <li...@gmail.com>
AuthorDate: Sat Jun 11 16:49:27 2022 -0400

    ARROW-16788: [C++] Remove hardening flags gRPC doesn't support (#13346)
    
    gRPC doesn't support building with certain flags that distros insert
    
    Authored-by: David Li <li...@gmail.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 4082b7d2ce..381b136e8d 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -3659,8 +3659,25 @@ macro(build_grpc)
   # Yuck, see https://stackoverflow.com/a/45433229/776560
   string(REPLACE ";" "|" GRPC_PREFIX_PATH_ALT_SEP "${GRPC_CMAKE_PREFIX}")
 
+  set(GRPC_C_FLAGS "${EP_C_FLAGS}")
+  set(GRPC_CXX_FLAGS "${EP_CXX_FLAGS}")
+  if(NOT MSVC)
+    # Negate warnings that gRPC cannot build under
+    # See https://github.com/grpc/grpc/issues/29417
+    set(GRPC_C_FLAGS
+        "${GRPC_C_FLAGS} -Wno-attributes -Wno-format-security -Wno-unknown-warning-option"
+    )
+    set(GRPC_CXX_FLAGS
+        "${GRPC_CXX_FLAGS} -Wno-attributes -Wno-format-security -Wno-unknown-warning-option"
+    )
+  endif()
+
   set(GRPC_CMAKE_ARGS
       "${EP_COMMON_CMAKE_ARGS}"
+      "-DCMAKE_C_FLAGS=${GRPC_C_FLAGS}"
+      "-DCMAKE_CXX_FLAGS=${GRPC_CXX_FLAGS}"
+      "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${GRPC_C_FLAGS}"
+      "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${GRPC_CXX_FLAGS}"
       -DCMAKE_PREFIX_PATH='${GRPC_PREFIX_PATH_ALT_SEP}'
       -DgRPC_ABSL_PROVIDER=package
       -DgRPC_BUILD_CSHARP_EXT=OFF