aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaƂ Janiszewski <janisozaur@users.noreply.github.com>2018-03-06 21:08:29 +0100
committerRobert Schumacher <roschuma@microsoft.com>2018-03-06 12:08:29 -0800
commitd4797b37a624f190e6a8e5a6519d2d0add282634 (patch)
tree731aefe720eba042ace08869b2fb7112a75671c2
parent87fb30839c255ff6e2cf00b9f44aaa46e2403fb9 (diff)
downloadvcpkg-d4797b37a624f190e6a8e5a6519d2d0add282634.tar.gz
vcpkg-d4797b37a624f190e6a8e5a6519d2d0add282634.zip
[curl] Add missing advapi32 link (#2978)
This adds missing library, advapi32, to linking. Fixes ARM builds. The same patch is pending merge upstream: https://github.com/curl/curl/pull/2363
-rw-r--r--ports/curl/0003_fix_libraries.patch13
-rw-r--r--ports/curl/portfile.cmake1
2 files changed, 14 insertions, 0 deletions
diff --git a/ports/curl/0003_fix_libraries.patch b/ports/curl/0003_fix_libraries.patch
new file mode 100644
index 000000000..a06e7b544
--- /dev/null
+++ b/ports/curl/0003_fix_libraries.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 490cc19ef8..23fe34f614 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -330,7 +330,7 @@ if(CMAKE_USE_WINSSL)
+ set(SSL_ENABLED ON)
+ set(USE_SCHANNEL ON) # Windows native SSL/TLS support
+ set(USE_WINDOWS_SSPI ON) # CMAKE_USE_WINSSL implies CURL_WINDOWS_SSPI
+- list(APPEND CURL_LIBS "crypt32")
++ list(APPEND CURL_LIBS "crypt32" "advapi32")
+ endif()
+ if(CURL_WINDOWS_SSPI)
+ set(USE_WINDOWS_SSPI ON)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index ffb73b425..94587649d 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_apply_patches(
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch
+ ${CMAKE_CURRENT_LIST_DIR}/0003_fix_libraries.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)