Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[c-ares] update to 1.18.1 #24062

Merged
merged 7 commits into from
Apr 11, 2022
Merged

[c-ares] update to 1.18.1 #24062

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26f8df5
[c-ares] update to 1.18.1
Thomas1664 Apr 9, 2022
70f2b65
patch
Thomas1664 Apr 9, 2022
8b62830
What's going on here?
Thomas1664 Apr 9, 2022
e9ab41e
I see...
Thomas1664 Apr 9, 2022
9c7c77d
version
Thomas1664 Apr 9, 2022
e9a7830
unsupported on UWP
Thomas1664 Apr 9, 2022
67062bc
version
Thomas1664 Apr 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/c-ares/avoid-docs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 194485a..e903e50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -618,7 +618,7 @@ ADD_SUBDIRECTORY (include)
ADD_SUBDIRECTORY (src)

# Docs
-ADD_SUBDIRECTORY (docs)
+#ADD_SUBDIRECTORY (docs)

# Tests
IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
10 changes: 6 additions & 4 deletions ports/c-ares/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO c-ares/c-ares
REF cares-1_17_2
SHA512 1111f1e7eeb0e5d9e70d1a7c8566145d0a5e6e71b020f3fcaa02ecdf1931553ddeff83fdc152a1f9c5a780078e8afe3670164b631df56eecd2b638210cc59bb3
HEAD_REF master
REF cares-1_18_1
SHA512 9f5f9d5a22a4643aef8701c4abfd4b28e0bded2479bab462d2dfc63a8f84348f02d3cfbd7c85cc1e06a154a3e4206721cb6669c7c61538ecdcd44268e4ce073e
HEAD_REF main
PATCHES
avoid-docs.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCARES_STATIC=${BUILD_STATIC}
-DCARES_SHARED=${BUILD_SHARED}
Expand Down
5 changes: 2 additions & 3 deletions ports/c-ares/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"name": "c-ares",
"version-semver": "1.17.2",
"port-version": 2,
"version-semver": "1.18.1",
"description": "A C library for asynchronous DNS requests",
"homepage": "https://github.com/c-ares/c-ares",
"supports": "!uwp",
"license": "MIT",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
13 changes: 13 additions & 0 deletions ports/cgal/avoid-docs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fd4e584d3..16533f5f71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ endif()#QT_DIRS

# and finally start actual build
add_subdirectory(Installation)
-add_subdirectory(Documentation/doc)
+#add_subdirectory(Documentation/doc)

if(NOT TARGET uninstall)
configure_file(
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ caf:arm-uwp=fail
caf:x64-uwp=fail
caffe2:x86-windows=fail
caffe2:arm64-windows=fail
c-ares:arm-uwp=fail
c-ares:x64-uwp=fail

# file conflict with dbg-macro
c-dbg-macro:x86-windows=skip
Expand Down