diff options
| author | Matioupi <Matioupi@users.noreply.github.com> | 2020-11-24 00:26:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 15:26:38 -0800 |
| commit | 256c8d6ac6b9d8c834a687b30274ee87c303cb5d (patch) | |
| tree | 0ac11e3b887f4e3660a9c84dad9ee604c78b3100 | |
| parent | 5cd25eee5ddc70668f43e944d586e62be49ccc75 (diff) | |
| download | vcpkg-256c8d6ac6b9d8c834a687b30274ee87c303cb5d.tar.gz vcpkg-256c8d6ac6b9d8c834a687b30274ee87c303cb5d.zip | |
[curl] Fixes pkgconfig file (#14715)
* Fix pkgconfig for windows debug build. Re-allow tool feature on non windows platforms
* Fix tool feature
* Modified debug/release prvate libs according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520444862
Added vcpkg_fixup_pkgconfig() according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520435718
* Delete portfile.cmake.orig
* Fix pkgconfig
* Revert "Fix pkgconfig"
This reverts commit cb4da8bcc5e92248c20065f34d5e5d1d88a0e5d4.
* Bump port version to 3
* add missing system libs for windows. made case type coherent for ws2_32
* Fix build on x64-linux triplet
* Reverted ws2_32 to Ws2_32 as discudssed in https://github.com/microsoft/vcpkg/pull/14350#discussion_r525893479
* More fixes for Linux build with features
* Fix for feature c-ares
* Formatting
* First fix attemps for https://github.com/microsoft/vcpkg/issues/14681
* More fix for https://github.com/microsoft/vcpkg/issues/14681 (Windows only for now)
* Add brotli dependcy when brotli feature is enabled
* Fixed indentation
Co-authored-by: Phoebe Ma <v-phma@microsoft.com>
| -rw-r--r-- | ports/curl/CONTROL | 3 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 15 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 26817daef..ad919d564 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,6 +1,6 @@ Source: curl Version: 7.73.0 -Port-Version: 3 +Port-Version: 4 Build-Depends: zlib Homepage: https://github.com/curl/curl Description: A library for transferring data with URLs @@ -51,4 +51,5 @@ Feature: sspi Description: SSPI support Feature: brotli +Build-Depends: brotli Description: brotli support (brotli)
\ No newline at end of file diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 419b22baa..d0d89fd6e 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -123,7 +123,14 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/mbedcrypto.lib" "-lmbedcrypto") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/nghttp2.lib" "-lnghttp2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssh2.lib" "-lssh2") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/cares.lib" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/cares.lib" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlicommon.lib" "-lbrotlicommon") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlidec.lib" "-lbrotlidec") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "-lpthreadVC3d") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " ${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -loptimized" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -ldebug" "") + elseif(VCPKG_TARGET_IS_LINUX) vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "-lcurl" "-lcurl-d") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a" "-lssl") @@ -152,6 +159,12 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/nghttp2.lib" "-lnghttp2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssh2.lib" "-lssh2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/cares.lib" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlicommon.lib" "-lbrotlicommon") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlidec.lib" "-lbrotlidec") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "-lpthreadVC3") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " ${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -loptimized" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -ldebug" "") elseif(VCPKG_TARGET_IS_LINUX) #vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "-lcurl" "-lcurl") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssl.a" "-lssl") |