mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
[curl] Set non-http as default feature (#9613)
* [curl] Set non-http as default feature * [curl] rebuild code * [curl] Add error info, disable uwp build when selecting feature winssl,sspi,tool * [curl] Remove deprecated function * [curl] Fix openssl dependency check in config.cmake
This commit is contained in:
Jack·Boos·Yu
GitHub
parent
f53110de25
commit
d4c6627acd
13
ports/curl/0008_fix_tools_path.patch
Normal file
13
ports/curl/0008_fix_tools_path.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 0e567e7..697dfea 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -71,7 +71,7 @@ target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS} ZLIB::ZLIB)
|
||||
|
||||
#INCLUDE(ModuleInstall OPTIONAL)
|
||||
|
||||
-install(TARGETS ${EXE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+install(TARGETS ${EXE_NAME} DESTINATION tools)
|
||||
#export(TARGETS ${EXE_NAME}
|
||||
# APPEND FILE ${PROJECT_BINARY_DIR}/curl-target.cmake
|
||||
# NAMESPACE CURL::
|
||||
12
ports/curl/0009_fix_openssl_config.patch
Normal file
12
ports/curl/0009_fix_openssl_config.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 42e490a..ec9e4d1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -348,6 +348,7 @@ if(CMAKE_USE_SECTRANSP)
|
||||
list(APPEND CURL_LIBS "${COREFOUNDATION_FRAMEWORK}" "${SECURITY_FRAMEWORK}")
|
||||
endif()
|
||||
|
||||
+set(USE_OPENSSL OFF)
|
||||
if(CMAKE_USE_OPENSSL)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
set(SSL_ENABLED ON)
|
||||
@ -1,9 +1,9 @@
|
||||
Source: curl
|
||||
Version: 7.68.0
|
||||
Version: 7.68.0-1
|
||||
Build-Depends: zlib
|
||||
Homepage: https://github.com/curl/curl
|
||||
Description: A library for transferring data with URLs
|
||||
Default-Features: ssl
|
||||
Default-Features: ssl, non-http
|
||||
|
||||
Feature: tool
|
||||
Description: Builds curl executable
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO curl/curl
|
||||
@ -14,88 +12,47 @@ vcpkg_from_github(
|
||||
0005_remove_imp_suffix.patch
|
||||
0006_fix_tool_depends.patch
|
||||
0007_disable_tool_export_curl_target.patch
|
||||
0008_fix_tools_path.patch
|
||||
0009_fix_openssl_config.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)
|
||||
|
||||
# Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location.
|
||||
set(HTTP2_OPTIONS)
|
||||
if("http2" IN_LIST FEATURES)
|
||||
set(HTTP2_OPTIONS -DUSE_NGHTTP2=ON)
|
||||
# winssl will enable sspi, but sspi do not support uwp
|
||||
if(("winssl" IN_LIST FEATURES OR "sspi" IN_LIST FEATURES OR "tool" IN_LIST FEATURES) AND (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP))
|
||||
message(FATAL_ERROR "winssl,sspi,tool are not supported on non-Windows and uwp platforms")
|
||||
endif()
|
||||
|
||||
# SSL
|
||||
set(USE_OPENSSL OFF)
|
||||
if("openssl" IN_LIST FEATURES)
|
||||
set(USE_OPENSSL ON)
|
||||
if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX)
|
||||
message(FATAL_ERROR "sectransp is not supported on non-Apple platforms")
|
||||
endif()
|
||||
|
||||
set(USE_WINSSL OFF)
|
||||
if("winssl" IN_LIST FEATURES)
|
||||
if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||
message(FATAL_ERROR "winssl is not supported on non-Windows platforms")
|
||||
endif()
|
||||
set(USE_WINSSL ON)
|
||||
endif()
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
# Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location.
|
||||
http2 USE_NGHTTP2
|
||||
openssl CMAKE_USE_OPENSSL
|
||||
mbedtls CMAKE_USE_MBEDTLS
|
||||
ssh CMAKE_USE_LIBSSH2
|
||||
tool BUILD_CURL_EXE
|
||||
c-ares ENABLE_ARES
|
||||
sspi CURL_WINDOWS_SSPI
|
||||
brotli CURL_BROTLI
|
||||
winssl CMAKE_USE_WINSSL
|
||||
sectransp CMAKE_USE_SECTRANSP
|
||||
|
||||
set(USE_MBEDTLS OFF)
|
||||
if("mbedtls" IN_LIST FEATURES)
|
||||
set(USE_MBEDTLS ON)
|
||||
endif()
|
||||
INVERTED_FEATURES
|
||||
non-http HTTP_ONLY
|
||||
)
|
||||
|
||||
set(USE_SECTRANSP OFF)
|
||||
set(SECTRANSP_OPTIONS)
|
||||
if("sectransp" IN_LIST FEATURES)
|
||||
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
|
||||
message(FATAL_ERROR "sectransp is not supported on non-Apple platforms")
|
||||
endif()
|
||||
set(USE_SECTRANSP ON)
|
||||
set(SECTRANSP_OPTIONS
|
||||
-DCURL_CA_PATH=none
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
# SSH
|
||||
set(USE_LIBSSH2 OFF)
|
||||
if("ssh" IN_LIST FEATURES)
|
||||
set(USE_LIBSSH2 ON)
|
||||
endif()
|
||||
|
||||
# HTTP/HTTPS only
|
||||
# Note that `HTTP_ONLY` curl option disables everything including HTTPS, which is not an option.
|
||||
set(USE_HTTP_ONLY ON)
|
||||
if("non-http" IN_LIST FEATURES)
|
||||
set(USE_HTTP_ONLY OFF)
|
||||
endif()
|
||||
|
||||
# curl exe
|
||||
set(BUILD_CURL_EXE OFF)
|
||||
if("tool" IN_LIST FEATURES)
|
||||
set(BUILD_CURL_EXE ON)
|
||||
endif()
|
||||
|
||||
# c-ares
|
||||
set(USE_ARES OFF)
|
||||
if("c-ares" IN_LIST FEATURES)
|
||||
set(USE_ARES ON)
|
||||
endif()
|
||||
|
||||
# SSPI
|
||||
set(USE_WINDOWS_SSPI OFF)
|
||||
if("sspi" IN_LIST FEATURES)
|
||||
set(USE_WINDOWS_SSPI ON)
|
||||
endif()
|
||||
|
||||
# brotli
|
||||
set(HAVE_BROTLI OFF)
|
||||
if("brotli" IN_LIST FEATURES)
|
||||
set(HAVE_BROTLI ON)
|
||||
set(SECTRANSP_OPTIONS -DCURL_CA_PATH=none)
|
||||
endif()
|
||||
|
||||
# UWP targets
|
||||
set(UWP_OPTIONS)
|
||||
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
set(UWP_OPTIONS
|
||||
-DUSE_WIN32_LDAP=OFF
|
||||
-DCURL_DISABLE_TELNET=ON
|
||||
@ -107,86 +64,37 @@ endif()
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
${UWP_OPTIONS}
|
||||
${SECTRANSP_OPTIONS}
|
||||
${HTTP2_OPTIONS}
|
||||
-DBUILD_TESTING=OFF
|
||||
-DBUILD_CURL_EXE=${BUILD_CURL_EXE}
|
||||
-DENABLE_MANUAL=OFF
|
||||
-DCURL_STATICLIB=${CURL_STATICLIB}
|
||||
-DCMAKE_USE_OPENSSL=${USE_OPENSSL}
|
||||
-DCMAKE_USE_WINSSL=${USE_WINSSL}
|
||||
-DCMAKE_USE_MBEDTLS=${USE_MBEDTLS}
|
||||
-DCMAKE_USE_SECTRANSP=${USE_SECTRANSP}
|
||||
-DCMAKE_USE_LIBSSH2=${USE_LIBSSH2}
|
||||
-DHTTP_ONLY=${USE_HTTP_ONLY}
|
||||
-DENABLE_ARES=${USE_ARES}
|
||||
-DCURL_WINDOWS_SSPI=${USE_WINDOWS_SSPI}
|
||||
-DCURL_BROTLI=${HAVE_BROTLI}
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
|
||||
OPTIONS_RELEASE
|
||||
-DBUILD_CURL_EXE=${BUILD_CURL_EXE}
|
||||
OPTIONS_DEBUG
|
||||
-DBUILD_CURL_EXE=OFF
|
||||
-DENABLE_DEBUG=ON
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/CURL)
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CURL)
|
||||
elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/curl)
|
||||
vcpkg_fixup_cmake_targets()
|
||||
else()
|
||||
message(FATAL_ERROR "Could not locate the curl config files")
|
||||
endif()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl RENAME copyright)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
# the native CMAKE_EXECUTABLE_SUFFIX does not work in portfiles, so emulate it
|
||||
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Windows
|
||||
set(EXECUTABLE_SUFFIX ".exe")
|
||||
else()
|
||||
set(EXECUTABLE_SUFFIX "")
|
||||
endif()
|
||||
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}")
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/curl")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/curl/curl${EXECUTABLE_SUFFIX}")
|
||||
if ("tool" IN_LIST FEATURES)
|
||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/curl)
|
||||
|
||||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||
file(READ "${CURRENT_PACKAGES_DIR}/share/curl/CURLTargets-release.cmake" RELEASE_MODULE)
|
||||
string(REPLACE "\${_IMPORT_PREFIX}/bin/curl${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/curl/curl${EXECUTABLE_SUFFIX}" RELEASE_MODULE "${RELEASE_MODULE}")
|
||||
file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/CURLTargets-release.cmake" "${RELEASE_MODULE}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib OR EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib)
|
||||
# Because vcpkg only ever installs one or the other, there is no need to have the libraries be different names.
|
||||
# Using the same name improves compatibility, because downstream projects can always rely on "libcurl.lib"
|
||||
message(FATAL_ERROR "Curl's import library name should be consistent with the static library name.")
|
||||
endif()
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CURL)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
else()
|
||||
file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/curl-config DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/curl-config ${CURRENT_PACKAGES_DIR}/debug/bin/curl-config)
|
||||
|
||||
file(GLOB FILES LIST_DIRECTORIES TRUE ${CURRENT_PACKAGES_DIR}/bin/*)
|
||||
if (FILES STREQUAL "")
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
|
||||
endif()
|
||||
|
||||
file(GLOB FILES LIST_DIRECTORIES TRUE ${CURRENT_PACKAGES_DIR}/debug/bin/*)
|
||||
if (FILES STREQUAL "")
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
endif()
|
||||
#Fix install path
|
||||
file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/curl-config CURL_CONFIG)
|
||||
string(REPLACE "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" CURL_CONFIG "${CURL_CONFIG}")
|
||||
file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/curl-config "${CURL_CONFIG}")
|
||||
endif()
|
||||
|
||||
file(READ ${CURRENT_PACKAGES_DIR}/include/curl/curl.h CURL_H)
|
||||
@ -197,8 +105,5 @@ else()
|
||||
endif()
|
||||
file(WRITE ${CURRENT_PACKAGES_DIR}/include/curl/curl.h "${CURL_H}")
|
||||
|
||||
file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_test_cmake(PACKAGE_NAME CURL)
|
||||
file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user