Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt
index c44546b0e..b66888362 100644
--- a/aws-cpp-sdk-core/CMakeLists.txt
+++ b/aws-cpp-sdk-core/CMakeLists.txt
@@ -113,13 +113,8 @@ if(ENABLE_CURL_CLIENT)
int main() {
CURL* handle = curl_easy_init();
return curl_easy_setopt(handle, CURLOPT_PROXY_SSLCERT, \"client.pem\"); }")
- if (CMAKE_CROSSCOMPILING)
- check_c_source_compiles("${CHECK_CURL_HAS_H2}" CURL_HAS_H2)
- check_c_source_compiles("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY)
- else()
- check_c_source_runs("${CHECK_CURL_HAS_H2}" CURL_HAS_H2)
- check_c_source_runs("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY)
- endif()
+ set(CURL_HAS_H2 OFF)
+ set(CURL_HAS_TLS_PROXY ON)
elseif(ENABLE_WINDOWS_CLIENT)
# NOTE: HTTP/2 is not supported when using IXML_HTTP_REQUEST_2
if(USE_IXML_HTTP_REQUEST_2)
3 changes: 2 additions & 1 deletion ports/aws-sdk-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vcpkg_from_github(
patch-relocatable-rpath.patch
fix-aws-root.patch
fix-openssl3.patch
lock-curl-http-and-tls-settings.patch
)

string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
Expand Down Expand Up @@ -49,7 +50,7 @@ vcpkg_cmake_install()

foreach(TARGET IN LISTS BUILD_ONLY)
vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
endforeach()
endforeach()
vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK")

vcpkg_copy_pdbs()
Expand Down
6 changes: 5 additions & 1 deletion ports/aws-sdk-cpp/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
"version": "1.9.220",
"port-version": 1,
"port-version": 2,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"supports": "!(windows & arm) & !uwp",
"dependencies": [
"aws-crt-cpp",
{
"name": "curl",
"default-features": false,
"features": [
"ssl"
],
"platform": "!uwp & !windows"
},
{
Expand Down
14 changes: 14 additions & 0 deletions ports/azure-core-cpp/add-ws232.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
index c536948..c94441b 100644
--- a/sdk/core/azure-core/CMakeLists.txt
+++ b/sdk/core/azure-core/CMakeLists.txt
@@ -170,6 +170,9 @@ endif()

if(BUILD_TRANSPORT_CURL)
target_link_libraries(azure-core PUBLIC CURL::libcurl)
+ if(WIN32)
+ target_link_libraries(azure-core PRIVATE Ws2_32)
+ endif()
endif()
if(BUILD_TRANSPORT_WINHTTP)
target_link_libraries(azure-core PRIVATE winhttp)
2 changes: 2 additions & 0 deletions ports/azure-core-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ vcpkg_from_github(
REPO Azure/azure-sdk-for-cpp
REF azure-core_1.7.2
SHA512 f24d02bf34f8be665e08a9a2799498f78daf6103a0ac5c10d79dc6b7b4461dac8ea2f91088e11bc90d0c74b59a59dc1e6361ad053718fb6da6a0691a9ac314a6
PATCHES
add-ws232.patch # https://github.com/Azure/azure-sdk-for-cpp/pull/4127
)

vcpkg_check_features(
Expand Down
1 change: 1 addition & 0 deletions ports/azure-core-cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "azure-core-cpp",
"version-semver": "1.7.2",
"port-version": 1,
"description": [
"Microsoft Azure Core SDK for C++",
"This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."
Expand Down
24 changes: 12 additions & 12 deletions ports/curl/0002_fix_uwp.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 62b7b33..8a4bd71 100644
index 8cea346c3..967312905 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -115,6 +115,10 @@ if(CURL_HAS_LTO)
INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE)
endif()

+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
+endif()
+
if(WIN32)
if(BUILD_SHARED_LIBS)
set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_USRDLL")
@@ -118,6 +118,10 @@ if(CURL_HAS_LTO)
INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE)
endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
+endif()
+
if(WIN32)
if(BUILD_SHARED_LIBS)
if(MSVC)
13 changes: 0 additions & 13 deletions ports/curl/0021-normaliz.patch

This file was deleted.

6 changes: 3 additions & 3 deletions ports/curl/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF curl-7_84_0
SHA512 2a000c052c14ee9e6bed243e92699517889554bc0dc03e9f28d398ecf14b405c336f1303e6ed15ed30e88d5d00fefecdc189e83def3f0a5431f63e3be1c55c35
REF curl-7_86_0
SHA512 74fa76d58b09ae15c953f77918172e23657efd8ed9d16e3a741525a4f350e6bd9691e0b0935aac11e3060cebff043dc4a17c3dde625a19ca7399c173ea4160c9
HEAD_REF master
PATCHES
0002_fix_uwp.patch
0005_remove_imp_suffix.patch
0012-fix-dependency-idn2.patch
0020-fix-pc-file.patch
0021-normaliz.patch # for mingw on case-sensitive file system
0022-deduplicate-libs.patch
mbedtls-ws2_32.patch
export-components.patch
Expand Down Expand Up @@ -49,6 +48,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
idn2 USE_LIBIDN2
winidn USE_WIN32_IDN
winldap USE_WIN32_LDAP
websockets ENABLE_WEBSOCKETS
INVERTED_FEATURES
non-http HTTP_ONLY
winldap CURL_DISABLE_LDAP # Only WinLDAP support ATM
Expand Down
6 changes: 4 additions & 2 deletions ports/curl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "curl",
"version": "7.84.0",
"port-version": 2,
"version": "7.86.0",
"description": "A library for transferring data with URLs",
"homepage": "https://curl.se/",
"license": null,
Expand Down Expand Up @@ -158,6 +157,9 @@
"tool": {
"description": "Builds curl executable"
},
"websockets": {
"description": "WebSocket support (experimental)"
},
"winidn": {
"description": "WinIDN support"
},
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/aws-sdk-cpp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8303c2804c010e352168fda9a38e7256c30d170d",
"version": "1.9.220",
"port-version": 2
},
{
"git-tree": "c7d142ac1a2667f6ba9650cab2505a71ffaddbd3",
"version": "1.9.220",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/azure-core-cpp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b9e5836104380238317ab53761a49a01fdb308fe",
"version-semver": "1.7.2",
"port-version": 1
},
{
"git-tree": "5c0aaa2cef20a29b4e141758ed3fcce954449d1b",
"version-semver": "1.7.2",
Expand Down
8 changes: 4 additions & 4 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
},
"aws-sdk-cpp": {
"baseline": "1.9.220",
"port-version": 1
"port-version": 2
},
"azmq": {
"baseline": "1.0.3",
Expand All @@ -346,7 +346,7 @@
},
"azure-core-cpp": {
"baseline": "1.7.2",
"port-version": 0
"port-version": 1
},
"azure-core-tracing-opentelemetry-cpp": {
"baseline": "1.0.0-beta.3",
Expand Down Expand Up @@ -1801,8 +1801,8 @@
"port-version": 8
},
"curl": {
"baseline": "7.84.0",
"port-version": 2
"baseline": "7.86.0",
"port-version": 0
},
"curlpp": {
"baseline": "2018-06-15",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/curl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ac2042be9746b4b193f99398f32bed8057f5d267",
"version": "7.86.0",
"port-version": 0
},
{
"git-tree": "588fa4742c417db9d7c0f89e652b618296388d1e",
"version": "7.84.0",
Expand Down