From 93d83e0a60a6e66f91a1cf9d02a490ca01348958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christophe=20Gu=C3=A9bert?= Date: Wed, 7 Dec 2016 09:04:49 +0100 Subject: Add a patch for curl to find the libssh2 library --- ports/curl/0001_cmake.patch | 13 +++++++++++++ ports/curl/portfile.cmake | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 ports/curl/0001_cmake.patch diff --git a/ports/curl/0001_cmake.patch b/ports/curl/0001_cmake.patch new file mode 100644 index 000000000..db281e122 --- /dev/null +++ b/ports/curl/0001_cmake.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake +index 12a7c61..9839c67 100644 +--- a/CMake/FindLibSSH2.cmake ++++ b/CMake/FindLibSSH2.cmake +@@ -12,7 +12,7 @@ endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY) + FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h + ) + +-FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 ++FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 libssh2 + ) + + if(LIBSSH2_INCLUDE_DIR) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index e2359f73d..01c76718b 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -7,6 +7,12 @@ vcpkg_download_distfile(ARCHIVE_FILE ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch +) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) SET(CURL_STATICLIB OFF) else() -- cgit v1.2.3 From c10e7e49606d087e5dacd6f26026e2489ed4ef62 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 9 Dec 2016 14:20:03 -0800 Subject: [curl] Bump version and require libssh2 --- ports/curl/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index bca23865d..e18ea2f67 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,4 +1,4 @@ Source: curl -Version: 7.51.0-1 -Build-Depends: zlib, openssl +Version: 7.51.0-2 +Build-Depends: zlib, openssl, libssh2 Description: A library for transferring data with URLs -- cgit v1.2.3