diff options
| author | Don Venable <venabled@users.noreply.github.com> | 2021-02-08 21:17:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 18:17:32 -0800 |
| commit | 3942db83e180ecb68c80d36d790ac47423a8dd38 (patch) | |
| tree | fd89db4721c3b12f0ca0321d00d3e0c189224c1f /ports | |
| parent | df76decfd6c0dc77dc80bb5763fbdd93c9cb9060 (diff) | |
| download | vcpkg-3942db83e180ecb68c80d36d790ac47423a8dd38.tar.gz vcpkg-3942db83e180ecb68c80d36d790ac47423a8dd38.zip | |
[curl] Fix/android curl debug bin (#15941)
* Add android to targets that need to nuke `debug/bin`
* Bumped port version number
* Bumped version SHA for curl
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/curl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 6253ca7e9..1ab6325cd 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Port-Version: 2 +Port-Version: 3 Version: 7.74.0 Build-Depends: zlib Homepage: https://github.com/curl/curl diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 6e18aecd0..732bd2585 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -97,7 +97,7 @@ file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/curl-config CURL_CONFIG) string(REPLACE "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" CURL_CONFIG "${CURL_CONFIG}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/curl-config "${CURL_CONFIG}") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() |