diff options
| author | Johannes Schönberger <johannes.schonberger@microsoft.com> | 2021-08-03 01:55:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 16:55:47 -0700 |
| commit | 9db6c29de7076a01e7f6a39d8266e6e41de7cbef (patch) | |
| tree | b8e5485464311b5e97f7db98de627d26e951f118 | |
| parent | 77935240e5049da73d41ea74b9b910fe94519b37 (diff) | |
| download | vcpkg-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>
| -rw-r--r-- | ports/c-ares/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/c-ares/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/c-/c-ares.json | 5 |
4 files changed, 9 insertions, 3 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" diff --git a/versions/baseline.json b/versions/baseline.json index eaf638991..4aec399c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1102,7 +1102,7 @@ }, "c-ares": { "baseline": "1.17.1", - "port-version": 1 + "port-version": 2 }, "c4core": { "baseline": "2021-07-18", diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json index 39bbc667c..60934c10b 100644 --- a/versions/c-/c-ares.json +++ b/versions/c-/c-ares.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "5d48aae0b9e4a0e201eab417117bab9491665193", + "version": "1.17.1", + "port-version": 2 + }, + { "git-tree": "1e8d84e28abdb8437a2665651b4359da40a3333f", "version": "1.17.1", "port-version": 1 |