aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorJohannes Schönberger <johannes.schonberger@microsoft.com>2021-08-03 01:55:47 +0200
committerGitHub <noreply@github.com>2021-08-02 16:55:47 -0700
commit9db6c29de7076a01e7f6a39d8266e6e41de7cbef (patch)
treeb8e5485464311b5e97f7db98de627d26e951f118 /ports
parent77935240e5049da73d41ea74b9b910fe94519b37 (diff)
downloadvcpkg-9db6c29de7076a01e7f6a39d8266e6e41de7cbef.tar.gz
vcpkg-9db6c29de7076a01e7f6a39d8266e6e41de7cbef.zip
Fix c-ares compilation under Linux with dynamic linkage (#19126)
* Fix c-ares compilation under Linux with shared linkage * Update version * Update version file Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
Diffstat (limited to 'ports')
-rw-r--r--ports/c-ares/portfile.cmake3
-rw-r--r--ports/c-ares/vcpkg.json2
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake
index 0ec1740da..a0e43f50e 100644
--- a/ports/c-ares/portfile.cmake
+++ b/ports/c-ares/portfile.cmake
@@ -32,10 +32,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ares.h
"#ifdef CARES_STATICLIB" "#if 1"
)
+endif()
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") # Empty folders
endif()
-
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json
index a8833ac42..996666f75 100644
--- a/ports/c-ares/vcpkg.json
+++ b/ports/c-ares/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "c-ares",
"version": "1.17.1",
- "port-version": 1,
+ "port-version": 2,
"description": "A C library for asynchronous DNS requests",
"homepage": "https://github.com/c-ares/c-ares",
"supports": "!uwp"