diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 59a25d91991cb..bed48b9eb580f 100644 --- 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 - c-ares_SOURCE: BUNDLED CUDA_VERSION: "12.4" steps: - uses: actions/checkout@v4 diff --git a/CMake/Findc-ares.cmake b/CMake/Findc-ares.cmake deleted file mode 100644 index 8577ebc4cabd3..0000000000000 --- a/CMake/Findc-ares.cmake +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -find_package(c-ares CONFIG) -if(c-ares_FOUND) - if(TARGET cares::cares) - return() - endif() -endif() - -find_path( - C_ARES_INCLUDE_DIR - NAMES ares.h - PATH_SUFFIXES c-ares) -find_library(C_ARES_LIBRARY NAMES c-ares) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(c-ares DEFAULT_MSG C_ARES_LIBRARY - C_ARES_INCLUDE_DIR) - -if(c-ares_FOUND AND NOT TARGET cares::cares) - add_library(cares::cares UNKNOWN IMPORTED) - set_target_properties( - cares::cares - PROPERTIES IMPORTED_LOCATION "${C_ARES_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${C_ARES_INCLUDE_DIR}") -endif() - -mark_as_advanced(C_ARES_INCLUDE_DIR C_ARES_LIBRARY) diff --git a/CMake/resolve_dependency_modules/c-ares.cmake b/CMake/resolve_dependency_modules/c-ares.cmake deleted file mode 100644 index 1a3df258d604c..0000000000000 --- a/CMake/resolve_dependency_modules/c-ares.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -include_guard(GLOBAL) - -set(VELOX_CARES_BUILD_VERSION cares-1_17_2) -set(VELOX_CARES_BUILD_SHA256_CHECKSUM - 444b7dbf33cb6e8a764d069e3485cbaaa28386d60eace6988275c3cb9534d300) -string(CONCAT VELOX_CARES_SOURCE_URL - "https://github.com/c-ares/c-ares/archive/refs/tags/" - "${VELOX_CARES_BUILD_VERSION}.tar.gz") - -resolve_dependency_url(CARES) - -message(STATUS "Building C-ARES from source") - -FetchContent_Declare( - c-ares - URL ${VELOX_CARES_SOURCE_URL} - URL_HASH ${VELOX_CARES_BUILD_SHA256_CHECKSUM} - OVERRIDE_FIND_PACKAGE EXCLUDE_FROM_ALL SYSTEM) - -set(CARES_STATIC ON) -set(CARES_INSTALL ON) -set(CARES_SHARED OFF) -FetchContent_MakeAvailable(c-ares) -add_library(cares::cares ALIAS c-ares) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36c37e813124b..8c5649d3f979a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -455,13 +455,10 @@ add_compile_definitions(FOLLY_HAVE_INT128_T=1) set_source(folly) resolve_dependency(folly) -# Spark qury runner depends on absl, c-ares, grpc. +# Spark qury runner depends on absl, grpc. set_source(absl) resolve_dependency(absl 20240116 EXACT) -set_source(c-ares) -resolve_dependency(c-ares) - set_source(gRPC) resolve_dependency(gRPC 1.48.1 EXACT) diff --git a/velox/functions/sparksql/fuzzer/CMakeLists.txt b/velox/functions/sparksql/fuzzer/CMakeLists.txt index f1a4bf661bb82..4a4f6ce937629 100644 --- a/velox/functions/sparksql/fuzzer/CMakeLists.txt +++ b/velox/functions/sparksql/fuzzer/CMakeLists.txt @@ -77,7 +77,7 @@ target_link_libraries( ZLIB::ZLIB re2::re2 gRPC::address_sorting - cares::cares + c-ares::cares OpenSSL::SSL OpenSSL::Crypto pthread @@ -106,7 +106,7 @@ target_link_libraries( ZLIB::ZLIB re2::re2 gRPC::address_sorting - cares::cares + c-ares::cares gRPC::upb OpenSSL::SSL OpenSSL::Crypto diff --git a/velox/functions/sparksql/fuzzer/tests/CMakeLists.txt b/velox/functions/sparksql/fuzzer/tests/CMakeLists.txt index ba18287485928..021e13eacb0c3 100644 --- a/velox/functions/sparksql/fuzzer/tests/CMakeLists.txt +++ b/velox/functions/sparksql/fuzzer/tests/CMakeLists.txt @@ -69,7 +69,7 @@ target_link_libraries( ZLIB::ZLIB re2::re2 gRPC::address_sorting - cares::cares + c-ares::cares gRPC::upb OpenSSL::SSL OpenSSL::Crypto