diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 009e54c7882c63..31e57e8fe0bac9 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Port-Version: 4 +Port-Version: 5 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 be66d452bea6d7..f888b0eb97dc2a 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -66,18 +66,7 @@ endif() if(VCPKG_TARGET_IS_ANDROID) set(ADDITIONAL_SCRIPTS -C "${CMAKE_CURRENT_LIST_DIR}/CurlAndroidCrossCompile.cmake") - set(EXTRA_ARGS -DOPENSSL_INCLUDE="${CURRENT_INSTALLED_DIR}/include") - - set(EXTRA_ARGS_DEBUG - -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/debug/lib/libssl.so" - -DCRYPT_LIBRARY="${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.so" - ) - - set(EXTRA_ARGS_RELEASE - -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libssl.so" - -DCRYPT_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libcrypto.so" - ) endif() vcpkg_configure_cmake( @@ -94,10 +83,6 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON -DENABLE_DEBUG=ON -DCURL_CA_FALLBACK=ON - OPTIONS_DEBUG - ${EXTRA_ARGS_DEBUG} - OPTIONS_RELEASE - ${EXTRA_ARGS_RELEASE} ) vcpkg_install_cmake() diff --git a/versions/baseline.json b/versions/baseline.json index a6d75aacff675f..11a8c117786113 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1534,7 +1534,7 @@ }, "curl": { "baseline": "7.74.0", - "port-version": 4 + "port-version": 5 }, "curlpp": { "baseline": "2018-06-15-3", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index aad7a5216eac9a..78ebc2381d5e83 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5793fb0f9f97ce5943e4c037dfa6d0c9418d79dc", + "version-string": "7.74.0", + "port-version": 5 + }, { "git-tree": "883db9cb07e4982bf1bf327d5b3fa5a88b6304d8", "version-string": "7.74.0",