diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-05-19 22:30:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-19 22:30:33 -0700 |
| commit | f796ee4d6034b448967085ea6b6e1dcb53fda8e6 (patch) | |
| tree | 7c7235d346ffe79fac58b344e7357aa0e874c009 | |
| parent | 7932abed8d10b59f6a448c71349667dded004106 (diff) | |
| parent | 032fa481b1c8655f5ffb1def2219d81db6ab3f8c (diff) | |
| download | vcpkg-f796ee4d6034b448967085ea6b6e1dcb53fda8e6.tar.gz vcpkg-f796ee4d6034b448967085ea6b6e1dcb53fda8e6.zip | |
Merge pull request #3476 from matttyson/curl
Fix Windows curl/nghttp2 static build
| -rw-r--r-- | ports/curl/0004_nghttp2_staticlib.patch | 14 | ||||
| -rw-r--r-- | ports/curl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/ports/curl/0004_nghttp2_staticlib.patch b/ports/curl/0004_nghttp2_staticlib.patch new file mode 100644 index 000000000..c5cba9c5f --- /dev/null +++ b/ports/curl/0004_nghttp2_staticlib.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 490cc19..51c0a92 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -388,6 +388,9 @@ if(USE_NGHTTP2) + find_package(NGHTTP2 REQUIRED) + include_directories(${NGHTTP2_INCLUDE_DIRS}) + list(APPEND CURL_LIBS ${NGHTTP2_LIBRARIES}) ++ if(CURL_STATICLIB) ++ add_definitions(-DNGHTTP2_STATICLIB) ++ endif() + endif() + + if(NOT CURL_DISABLE_LDAP) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index d1de96015..61456a99b 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.60.0 +Version: 7.60.0-1 Build-Depends: zlib Description: A library for transferring data with URLs Default-Features: ssl diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index d2a4bee9f..329ead341 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch ${CMAKE_CURRENT_LIST_DIR}/0003_fix_libraries.patch + ${CMAKE_CURRENT_LIST_DIR}/0004_nghttp2_staticlib.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) |