From 5d99a41a77f3ad2ba83fd70ce99c89e2e50f9d85 Mon Sep 17 00:00:00 2001 From: Don Olmstead Date: Thu, 14 Nov 2024 15:38:32 -0800 Subject: [PATCH] Remove c-ares port Use the canonical vcpkg port at https://github.com/microsoft/vcpkg/tree/master/ports/c-ares Align the c-ares feature in the overlay to match the canonical port. --- .reqcheck.yml | 5 --- README.md | 1 - ports/c-ares/portfile.cmake | 65 ------------------------------------- ports/c-ares/vcpkg.json | 17 ---------- ports/curl/vcpkg.json | 2 +- 5 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 ports/c-ares/portfile.cmake delete mode 100644 ports/c-ares/vcpkg.json diff --git a/.reqcheck.yml b/.reqcheck.yml index a2b0499e..933915f5 100644 --- a/.reqcheck.yml +++ b/.reqcheck.yml @@ -47,11 +47,6 @@ repos: owner: ngtcp2 repo: ngtcp2 - c-ares: - host: github - owner: c-ares - repo: c-ares - curl: host: github owner: curl diff --git a/README.md b/README.md index 9c52587b..34e242eb 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ | [nghttp2](https://nghttp2.org) | 1.64.0 | 2024-10-21 | | [nghttp3](https://github.com/ngtcp2/nghttp3) | 1.6.0 | 2024-10-05 | | [ngtcp2](https://github.com/ngtcp2/ngtcp2) | 1.8.1 | 2024-10-17 | -| [c-ares](https://c-ares.org) | 1.33.0 | 2024-08-02 | | [curl](https://curl.se) | 8.11.0 | 2024-11-05 | | [libxml2](http://xmlsoft.org) | 2.13.5 | 2024-11-12 | | [libxslt](http://xmlsoft.org/libxslt) | 1.1.42 | 2024-07-04 | diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake deleted file mode 100644 index 7fd2fc1a..00000000 --- a/ports/c-ares/portfile.cmake +++ /dev/null @@ -1,65 +0,0 @@ -set(VERSION 1.33.0) - -set(FILENAME "c-ares-${VERSION}.tar.gz") -set(URLS "https://github.com/c-ares/c-ares/releases/download/v${VERSION}/${FILENAME}") - -# Get archive -vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - FILENAME ${FILENAME} - SHA512 3cf1b94d6e8e53742703a679d7e35d3f985320720f41fa58189a0bcad4aca80405c73c4689abe7879df292dbe8f3ddca34b2d48429af5afcc9d2933edb075788 -) - -# Extract archive -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} - PATCHES ${PATCHES} -) - -# Run CMake build -set(BUILD_OPTIONS - -DCARES_INSTALL=ON - -DCARES_BUILD_TESTS=OFF - -DCARES_BUILD_CONTAINER_TESTS=OFF - -DCARES_BUILD_TOOLS=OFF -) - -if (${VCPKG_LIBRARY_LINKAGE} STREQUAL static) - set(CARES_STATIC ON) - set(CARES_SHARED OFF) -else () - set(CARES_STATIC OFF) - set(CARES_SHARED ON) -endif () - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - ${BUILD_OPTIONS} - -DCARES_STATIC=${CARES_STATIC} - -DCARES_SHARED=${CARES_SHARED} -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c-ares) -vcpkg_fixup_pkgconfig() - -# Prepare distribution -if(CARES_STATIC) - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/include/ares.h" - "#ifdef CARES_STATICLIB" "#if 1" - ) - - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/c-ares RENAME copyright) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/c-ares/version ${VERSION}) diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json deleted file mode 100644 index d735776f..00000000 --- a/ports/c-ares/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "c-ares", - "version": "1.33.0", - "description": "A C library for asynchronous DNS requests", - "homepage": "https://c-ares.org", - "license": "MIT-CMU", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 30f75c82..902f0bbc 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -17,7 +17,7 @@ "zlib" ], "features": { - "ares": { + "c-ares": { "description": "Enable c-ares for asynchronous DNS requests.", "dependencies": [ "c-ares"