Use openssl

facebookincubator · Jun 28, 2024 · 3f81806 · 3f81806
1 parent 2532ed4
commit 3f81806
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 49 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -62,7 +62,6 @@ jobs:
       Protobuf_SOURCE: BUNDLED # can be removed after #10134 is merged
       simdjson_SOURCE: BUNDLED
       xsimd_SOURCE: BUNDLED
-      boringssl_SOURCE: BUNDLED
       c-ares_SOURCE: BUNDLED
       CUDA_VERSION: "12.4"
     steps:

diff --git a/CMake/resolve_dependency_modules/boringssl.cmake b/CMake/resolve_dependency_modules/boringssl.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -455,7 +455,7 @@ add_compile_definitions(FOLLY_HAVE_INT128_T=1)
 set_source(folly)
 resolve_dependency(folly)
 
-# Spark qury runner depends on absl, c-ares, grpc and boringssl.
+# Spark qury runner depends on absl, c-ares, grpc.
 set_source(absl)
 resolve_dependency(absl 20240116 EXACT)
 
@@ -465,9 +465,6 @@ resolve_dependency(c-ares)
 set_source(gRPC)
 resolve_dependency(gRPC 1.48.1 EXACT)
 
-set_source(boringssl)
-resolve_dependency(boringssl)
-
 if(VELOX_ENABLE_REMOTE_FUNCTIONS)
   # TODO: Move this to use resolve_dependency(). For some reason, FBThrift
   # requires clients to explicitly install fizz and wangle.

diff --git a/velox/functions/sparksql/fuzzer/CMakeLists.txt b/velox/functions/sparksql/fuzzer/CMakeLists.txt
@@ -78,8 +78,8 @@ target_link_libraries(
   re2::re2
   gRPC::address_sorting
   cares::cares
-  boringssl::ssl
-  boringssl::crypto
+  OpenSSL::SSL
+  OpenSSL::Crypto
   pthread
   arrow
   lz4::lz4
@@ -108,8 +108,8 @@ target_link_libraries(
   gRPC::address_sorting
   cares::cares
   gRPC::upb
-  boringssl::ssl
-  boringssl::crypto
+  OpenSSL::SSL
+  OpenSSL::Crypto
   absl::statusor
   absl::status
   absl::cordz_info

diff --git a/velox/functions/sparksql/fuzzer/tests/CMakeLists.txt b/velox/functions/sparksql/fuzzer/tests/CMakeLists.txt
@@ -71,8 +71,8 @@ target_link_libraries(
   gRPC::address_sorting
   cares::cares
   gRPC::upb
-  boringssl::ssl
-  boringssl::crypto
+  OpenSSL::SSL
+  OpenSSL::Crypto
   absl::statusor
   absl::status
   absl::cordz_info