diff options
| author | siposcsaba89 <siposcsaba89@gmail.com> | 2020-04-16 22:31:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 13:31:08 -0700 |
| commit | cb8cdc2721d78b8df490bf0bdec2ddb30c4c0570 (patch) | |
| tree | f1f31f4823ce26c54e2403a5e9e94feafb75478b | |
| parent | 4ff057d5ba15ca7a8240acc2ba1f68256c9974da (diff) | |
| download | vcpkg-cb8cdc2721d78b8df490bf0bdec2ddb30c4c0570.tar.gz vcpkg-cb8cdc2721d78b8df490bf0bdec2ddb30c4c0570.zip | |
[curl] Fix cmake configure error in othertests.cmake check_type_size call, CMAKE_TRY_COMPILE_TARGET_TYPE was set to STATIC_LIBRARY (#10659)
| -rw-r--r-- | ports/curl/0010_fix_othertests_cmake.patch | 12 | ||||
| -rw-r--r-- | ports/curl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/ports/curl/0010_fix_othertests_cmake.patch b/ports/curl/0010_fix_othertests_cmake.patch new file mode 100644 index 000000000..ba1c742a0 --- /dev/null +++ b/ports/curl/0010_fix_othertests_cmake.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake +index c1c9aa3..378a5bd 100644 +--- a/CMake/OtherTests.cmake ++++ b/CMake/OtherTests.cmake +@@ -185,6 +185,7 @@ if(HAVE_SIGNAL_H) + set(CMAKE_REQUIRED_FLAGS "-DHAVE_SIGNAL_H") + set(CMAKE_EXTRA_INCLUDE_FILES "signal.h") + endif() ++unset(CMAKE_TRY_COMPILE_TARGET_TYPE) + check_type_size("sig_atomic_t" SIZEOF_SIG_ATOMIC_T) + if(HAVE_SIZEOF_SIG_ATOMIC_T) + check_c_source_compiles(" diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 05efb2174..28b0344f0 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.68.0-2 +Version: 7.68.0-3 Build-Depends: zlib Homepage: https://github.com/curl/curl Description: A library for transferring data with URLs diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 3aa78a5cd..4aabe47f2 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( 0007_disable_tool_export_curl_target.patch 0008_fix_tools_path.patch 0009_fix_openssl_config.patch + 0010_fix_othertests_cmake.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) |