[curl] Update to 8.16.0 (#47209)

This commit is contained in:
Kai Pastor 2025-09-10 21:09:55 +02:00 committed by GitHub
parent 9b34aba632
commit 7e19f3c64c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 21 additions and 9 deletions

View File

@ -12,7 +12,7 @@ index 86add74..be7b193 100644
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${CARES_PC_REQUIRES})
include_directories(SYSTEM ${CARES_INCLUDE_DIRS})
@@ -789,7 +789,7 @@ if(CURL_USE_MBEDTLS)
find_package(MbedTLS REQUIRED)
endif()
set(_ssl_enabled ON)
set(USE_MBEDTLS ON)
- list(APPEND CURL_LIBS ${MBEDTLS_LIBRARIES})

View File

@ -89,7 +89,7 @@ index 5518416..c0c29da 100644
@@ -155,7 +155,7 @@ while test "$#" -gt 0; do
curllibdir=''
fi
if test 'X@ENABLE_SHARED@' = 'Xno'; then
if test '@ENABLE_SHARED@' = 'no'; then
- echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
+ echo "@libdir@/libcurl.@libext@ @LIBCURL_PC_LDFLAGS_PRIVATE@ @CURL_CONFIG_LIBS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@"
else
@ -98,7 +98,7 @@ index 5518416..c0c29da 100644
@@ -167,7 +167,7 @@ while test "$#" -gt 0; do
--static-libs)
if test 'X@ENABLE_STATIC@' != 'Xno'; then
if test '@ENABLE_STATIC@' != 'no'; then
- echo "@libdir@/libcurl.@libext@ @LIBCURL_PC_LDFLAGS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@"
+ echo "@libdir@/libcurl.@libext@ @LIBCURL_PC_LDFLAGS_PRIVATE@ @CURL_CONFIG_LIBS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@"
else

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF ${curl_version}
SHA512 d4a560e225d0110133f44ed57cf5394c1710530c5fec395d02baafaac9ea2186dd543047ae27fd7542894b8744070760516ae611602105b1b40605abbf84e684
SHA512 9530537a2e9b1e22fa75f3816a122f34b46348e462e74bae2eb3aaa8927de44ac1dd4ce9517f38937d32de4add3151071cc01bdd5554a2000aa9f4db18c0de9b
HEAD_REF master
PATCHES
dependencies.patch
@ -17,6 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
http3 USE_NGTCP2
wolfssl CURL_USE_WOLFSSL
openssl CURL_USE_OPENSSL
openssl CURL_CA_FALLBACK
mbedtls CURL_USE_MBEDTLS
ssh CURL_USE_LIBSSH2
tool BUILD_CURL_EXE
@ -82,7 +83,6 @@ vcpkg_cmake_configure(
-DENABLE_CURL_MANUAL=OFF
-DIMPORT_LIB_SUFFIX= # empty
-DSHARE_LIB_OBJECT=OFF
-DCURL_CA_FALLBACK=ON
-DCURL_USE_PKGCONFIG=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
MAYBE_UNUSED_VARIABLES

View File

@ -1,7 +1,6 @@
{
"name": "curl",
"version": "8.15.0",
"port-version": 1,
"version": "8.16.0",
"description": "A library for transferring data with URLs",
"homepage": "https://curl.se/",
"license": "curl AND ISC AND BSD-3-Clause",

View File

@ -1,4 +1,11 @@
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
vcpkg_download_distfile(curl_8_16_patch
URLS https://github.com/Kitware/CMake/commit/c8143074cf3954b1e169904eb9d843cfbe14acc3.diff?full_index=1
FILENAME Kitware-CMake-curl_8_16.diff
SHA512 25b448798a314705982d957f18cddc6ca235ef8283ed6d32bab0aa949cee518a273dec79dfd48bbe24bbf1781c098a1c3e892134c3aa69efcfec410b9f4d7b6f
)
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.kitware.com/
OUT_SOURCE_PATH SOURCE_PATH
@ -8,6 +15,7 @@ vcpkg_from_gitlab(
HEAD_REF master
PATCHES
fix-dependency-libuv.patch
"${curl_8_16_patch}"
)
set(OPTIONS "")
if(VCPKG_TARGET_IS_WINDOWS)

View File

@ -2237,8 +2237,8 @@
"port-version": 8
},
"curl": {
"baseline": "8.15.0",
"port-version": 1
"baseline": "8.16.0",
"port-version": 0
},
"curlcpp": {
"baseline": "3.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3905962f11b04dbdff1d1c976c7a1e5248048bb2",
"version": "8.16.0",
"port-version": 0
},
{
"git-tree": "c5d9f2f0044ff09a375a67bd48932a2c020f5bee",
"version": "8.15.0",