mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-04 02:52:58 +02:00
cmake-bootstrap: update to 4.0.3.
This commit is contained in:
Đoàn Trần Công Danh
parent
3097830b9c
commit
1a8adeb2e8
6 changed files with 66 additions and 69 deletions
|
|
@ -17,7 +17,7 @@
|
|||
endif()
|
||||
endif()
|
||||
|
||||
@@ -474,7 +472,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
|
||||
@@ -473,7 +471,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
|
||||
add_custom_target(uninstall
|
||||
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
|
||||
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
--- a/Source/CMakeLists.txt
|
||||
+++ b/Source/CMakeLists.txt
|
||||
@@ -1136,6 +1136,7 @@ endif()
|
||||
@@ -1160,6 +1160,7 @@ endif()
|
||||
#
|
||||
# Build CPackLib
|
||||
#
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
add_library(
|
||||
CPackLib
|
||||
CPack/cmCPackArchiveGenerator.cxx
|
||||
@@ -1168,9 +1169,10 @@ target_include_directories(
|
||||
@@ -1192,9 +1193,10 @@ target_include_directories(
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/CPack"
|
||||
)
|
||||
target_link_libraries(CPackLib PUBLIC CMakeLib)
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
target_sources(
|
||||
CPackLib
|
||||
PRIVATE
|
||||
@@ -1288,11 +1290,6 @@ add_executable(ctest ctest.cxx)
|
||||
@@ -1312,11 +1314,6 @@ add_executable(ctest ctest.cxx)
|
||||
target_link_libraries(ctest PRIVATE CTestLib ManifestLib)
|
||||
list(APPEND _tools ctest)
|
||||
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
add_subdirectory(CursesDialog)
|
||||
--- a/Tests/CMakeLists.txt
|
||||
+++ b/Tests/CMakeLists.txt
|
||||
@@ -150,7 +150,6 @@ if(BUILD_TESTING)
|
||||
@@ -146,7 +146,6 @@ if(BUILD_TESTING)
|
||||
endif()
|
||||
|
||||
# Look for git to use for tests.
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
# The tool does not work with spaces in the path.
|
||||
--- a/Tests/RunCMake/CMakeLists.txt
|
||||
+++ b/Tests/RunCMake/CMakeLists.txt
|
||||
@@ -929,9 +929,6 @@ add_RunCMake_test(file-GET_RUNTIME_DEPEN
|
||||
@@ -981,9 +981,6 @@ add_RunCMake_test(file-GET_RUNTIME_DEPEN
|
||||
-DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}
|
||||
)
|
||||
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
if(XCODE_VERSION)
|
||||
set(ExternalProject_ARGS -DXCODE_VERSION=${XCODE_VERSION})
|
||||
endif()
|
||||
@@ -953,9 +950,6 @@ add_RunCMake_test(CTestCommandLine -DTES
|
||||
@@ -1005,9 +1002,6 @@ add_RunCMake_test(CTestCommandLine -DTES
|
||||
add_RunCMake_test(CacheNewline)
|
||||
# Only run this test on unix platforms that support
|
||||
# symbolic links
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
|
||||
set(IfacePaths_INCDIRS_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
|
||||
add_RunCMake_test(IfacePaths_INCDIRS TEST_DIR IfacePaths)
|
||||
@@ -1132,7 +1126,6 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k"
|
||||
@@ -1186,7 +1180,6 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k"
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
@ -99,10 +99,10 @@
|
|||
|
||||
if(CMake_TEST_CPACK_WIX3 OR CMake_TEST_CPACK_WIX4)
|
||||
add_RunCMake_test(CPack_WIX
|
||||
@@ -1189,29 +1182,6 @@ add_RunCMake_test(PrecompileHeaders -DCM
|
||||
-DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION})
|
||||
@@ -1247,30 +1240,6 @@ add_RunCMake_test(UnityBuild -DCMake_TES
|
||||
set_property(TEST RunCMake.UnityBuild APPEND
|
||||
PROPERTY LABELS "CUDA")
|
||||
|
||||
add_RunCMake_test(UnityBuild -DCMake_TEST_OBJC=${CMake_TEST_OBJC})
|
||||
-add_RunCMake_test(CMakePresets
|
||||
- -DPython_EXECUTABLE=${Python_EXECUTABLE}
|
||||
- -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
|
||||
|
|
@ -126,6 +126,7 @@
|
|||
- -DPython_EXECUTABLE=${Python_EXECUTABLE}
|
||||
- -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
|
||||
- )
|
||||
|
||||
-
|
||||
add_RunCMake_test(VerifyHeaderSets)
|
||||
add_RunCMake_test(set_tests_properties)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
--- a/Source/cmFileCommand.cxx
|
||||
+++ b/Source/cmFileCommand.cxx
|
||||
@@ -2130,9 +2130,6 @@ bool HandleDownloadCommand(std::vector<s
|
||||
res = ::curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
|
||||
@@ -2153,10 +2153,6 @@ bool HandleDownloadCommand(std::vector<s
|
||||
check_curl_result(res, "DOWNLOAD cannot set http failure option: ");
|
||||
|
||||
- res = ::curl_easy_setopt(curl, CURLOPT_USERAGENT, "curl/" LIBCURL_VERSION);
|
||||
curl_version_info_data* cv = curl_version_info(CURLVERSION_FIRST);
|
||||
- res = ::curl_easy_setopt(
|
||||
- curl, CURLOPT_USERAGENT,
|
||||
- cmStrCat("curl/", cv ? cv->version : LIBCURL_VERSION).c_str());
|
||||
- check_curl_result(res, "DOWNLOAD cannot set user agent option: ");
|
||||
-
|
||||
|
||||
res = ::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cmWriteToFileCallback);
|
||||
check_curl_result(res, "DOWNLOAD cannot set write function: ");
|
||||
|
||||
@@ -2153,15 +2150,6 @@ bool HandleDownloadCommand(std::vector<s
|
||||
@@ -2181,15 +2177,6 @@ bool HandleDownloadCommand(std::vector<s
|
||||
}
|
||||
}
|
||||
|
||||
- // check to see if TLS verification is requested
|
||||
- if (tls_verify && *tls_verify) {
|
||||
- if (tlsVerifyOpt.has_value() && tlsVerifyOpt.value()) {
|
||||
- res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1);
|
||||
- check_curl_result(res, "DOWNLOAD cannot set TLS/SSL Verify on: ");
|
||||
- } else {
|
||||
|
|
@ -23,10 +24,10 @@
|
|||
- check_curl_result(res, "DOWNLOAD cannot set TLS/SSL Verify off: ");
|
||||
- }
|
||||
-
|
||||
for (const auto& range : curl_ranges) {
|
||||
for (auto const& range : curl_ranges) {
|
||||
std::string curl_range = range.first + '-' +
|
||||
(range.second.has_value() ? range.second.value() : "");
|
||||
@@ -2196,25 +2184,11 @@ bool HandleDownloadCommand(std::vector<s
|
||||
@@ -2224,25 +2211,11 @@ bool HandleDownloadCommand(std::vector<s
|
||||
res = ::curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &chunkDebug);
|
||||
check_curl_result(res, "DOWNLOAD cannot set debug data: ");
|
||||
|
||||
|
|
@ -52,12 +53,12 @@
|
|||
// Need the progress helper's scope to last through the duration of
|
||||
// the curl_easy_perform call... so this object is declared at function
|
||||
// scope intentionally, rather than inside the "if(showProgress)"
|
||||
@@ -2530,15 +2504,6 @@ bool HandleUploadCommand(std::vector<std
|
||||
@@ -2579,15 +2552,6 @@ bool HandleUploadCommand(std::vector<std
|
||||
}
|
||||
}
|
||||
|
||||
- // check to see if TLS verification is requested
|
||||
- if (tls_verify && *tls_verify) {
|
||||
- if (tlsVerifyOpt.has_value() && tlsVerifyOpt.value()) {
|
||||
- res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1);
|
||||
- check_curl_result(res, "UPLOAD cannot set TLS/SSL Verify on: ");
|
||||
- } else {
|
||||
|
|
@ -68,7 +69,7 @@
|
|||
// check to see if a CAINFO file has been specified
|
||||
// command arg comes first
|
||||
std::string const& cainfo_err = cmCurlSetCAInfo(curl, cainfo);
|
||||
@@ -2556,25 +2521,11 @@ bool HandleUploadCommand(std::vector<std
|
||||
@@ -2605,25 +2569,11 @@ bool HandleUploadCommand(std::vector<std
|
||||
res = ::curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &chunkDebug);
|
||||
check_curl_result(res, "UPLOAD cannot set debug data: ");
|
||||
|
||||
|
|
@ -96,7 +97,7 @@
|
|||
// scope intentionally, rather than inside the "if(showProgress)"
|
||||
--- a/Tests/RunCMake/CMakeLists.txt
|
||||
+++ b/Tests/RunCMake/CMakeLists.txt
|
||||
@@ -560,7 +560,6 @@ if(COVERAGE_COMMAND)
|
||||
@@ -595,7 +595,6 @@ if(COVERAGE_COMMAND)
|
||||
add_RunCMake_test(ctest_coverage -DCOVERAGE_COMMAND=${COVERAGE_COMMAND})
|
||||
endif()
|
||||
add_RunCMake_test(ctest_start)
|
||||
|
|
@ -104,17 +105,17 @@
|
|||
add_RunCMake_test(ctest_test
|
||||
-DIMAGE_DIR=${CMAKE_SOURCE_DIR}/Utilities/Sphinx/static
|
||||
)
|
||||
@@ -584,7 +583,6 @@ foreach(var
|
||||
@@ -623,7 +622,6 @@ foreach(var
|
||||
list(APPEND file-DOWNLOAD_ARGS -D${var}=${${var}})
|
||||
endif()
|
||||
endforeach()
|
||||
-add_RunCMake_test(file-DOWNLOAD)
|
||||
add_RunCMake_test(file-MAKE_DIRECTORY)
|
||||
add_RunCMake_test(file-RPATH
|
||||
-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
|
||||
-DCMake_TEST_ELF_LARGE=${CMake_TEST_ELF_LARGE}
|
||||
--- a/Utilities/cmcurl/CMakeLists.txt
|
||||
+++ b/Utilities/cmcurl/CMakeLists.txt
|
||||
@@ -29,13 +29,13 @@ set(CURL_DISABLE_DIGEST_AUTH OFF)
|
||||
@@ -36,13 +36,13 @@ set(CURL_DISABLE_DIGEST_AUTH OFF)
|
||||
set(CURL_DISABLE_DOH OFF)
|
||||
set(CURL_DISABLE_FILE OFF CACHE INTERNAL "Disable curl file protocol?")
|
||||
set(CURL_DISABLE_FORM_API OFF)
|
||||
|
|
@ -130,14 +131,15 @@
|
|||
+set(CURL_DISABLE_HTTP ON CACHE INTERNAL "Disable curl http protocol?")
|
||||
set(CURL_DISABLE_IMAP ON CACHE INTERNAL "Disable curl imap protocol?")
|
||||
set(CURL_DISABLE_INSTALL ON)
|
||||
set(CURL_DISABLE_KERBEROS_AUTH OFF)
|
||||
@@ -51,12 +51,12 @@ set(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFI
|
||||
set(CURL_DISABLE_IPFS OFF)
|
||||
@@ -59,13 +59,13 @@ set(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFI
|
||||
set(CURL_DISABLE_PARSEDATE OFF)
|
||||
set(CURL_DISABLE_POP3 ON CACHE INTERNAL "Disable curl pop3 protocol?")
|
||||
set(CURL_DISABLE_PROGRESS_METER OFF)
|
||||
-set(CURL_DISABLE_PROXY OFF CACHE INTERNAL "Do not disable curl proxy")
|
||||
+set(CURL_DISABLE_PROXY ON CACHE INTERNAL "Do not disable curl proxy")
|
||||
set(CURL_DISABLE_RTSP ON CACHE INTERNAL "Disable curl rtsp protocol?")
|
||||
set(CURL_DISABLE_SHA512_256 OFF)
|
||||
set(CURL_DISABLE_SHUFFLE_DNS OFF)
|
||||
set(CURL_DISABLE_SMB OFF)
|
||||
set(CURL_DISABLE_SMTP ON CACHE INTERNAL "Disable curl smtp protocol?")
|
||||
|
|
@ -146,7 +148,7 @@
|
|||
set(CURL_DISABLE_SRP OFF)
|
||||
set(CURL_DISABLE_TELNET ON CACHE INTERNAL "Disable curl telnet protocol?")
|
||||
set(CURL_DISABLE_TFTP ON CACHE INTERNAL "Disable curl tftp protocol?")
|
||||
@@ -73,7 +73,7 @@ set(ENABLE_ALT_SVC OFF)
|
||||
@@ -84,7 +84,7 @@ set(ENABLE_ALT_SVC OFF)
|
||||
set(ENABLE_CURLDEBUG OFF CACHE INTERNAL "No curl TrackMemory features")
|
||||
set(ENABLE_DEBUG OFF CACHE INTERNAL "No curl debug features")
|
||||
set(ENABLE_INET_PTON OFF CACHE INTERNAL "Set to OFF to prevent usage of inet_pton when building against modern SDKs while still requiring compatibility with older Windows versions, such as Windows XP, Windows Server 2003 etc.")
|
||||
|
|
@ -155,7 +157,7 @@
|
|||
set(ENABLE_MANUAL OFF CACHE INTERNAL "No curl built-in manual")
|
||||
set(ENABLE_THREADED_RESOLVER OFF CACHE INTERNAL "No curl POSIX threaded DNS lookup")
|
||||
set(ENABLE_UNICODE OFF)
|
||||
@@ -92,9 +92,9 @@ set(PICKY_COMPILER OFF CACHE INTERNAL "E
|
||||
@@ -103,9 +103,9 @@ set(PICKY_COMPILER OFF)
|
||||
set(SHARE_LIB_OBJECT OFF)
|
||||
set(USE_ECH OFF)
|
||||
set(USE_HTTPSRR OFF)
|
||||
|
|
@ -167,29 +169,6 @@
|
|||
set(USE_NGTCP2 OFF)
|
||||
set(USE_OPENSSL_QUIC OFF)
|
||||
set(USE_QUICHE OFF)
|
||||
@@ -371,11 +371,11 @@ cmake_dependent_option(CURL_DISABLE_FORM
|
||||
"NOT CURL_DISABLE_MIME" ON)
|
||||
mark_as_advanced(CURL_DISABLE_FORM_API)
|
||||
endif()
|
||||
-option(CURL_DISABLE_FTP "disables FTP" OFF)
|
||||
+option(CURL_DISABLE_FTP "disables FTP" ON)
|
||||
mark_as_advanced(CURL_DISABLE_FTP)
|
||||
option(CURL_DISABLE_GETOPTIONS "disables curl_easy_options API for existing options to curl_easy_setopt" OFF)
|
||||
mark_as_advanced(CURL_DISABLE_GETOPTIONS)
|
||||
-option(CURL_DISABLE_GOPHER "disables Gopher" OFF)
|
||||
+option(CURL_DISABLE_GOPHER "disables Gopher" ON)
|
||||
mark_as_advanced(CURL_DISABLE_GOPHER)
|
||||
option(CURL_DISABLE_HEADERS_API "disables headers-api support" OFF)
|
||||
mark_as_advanced(CURL_DISABLE_HEADERS_API)
|
||||
@@ -383,7 +383,7 @@ option(CURL_DISABLE_HSTS "disables HSTS
|
||||
mark_as_advanced(CURL_DISABLE_HSTS)
|
||||
option(CURL_DISABLE_HTTP "disables HTTP" OFF)
|
||||
mark_as_advanced(CURL_DISABLE_HTTP)
|
||||
-option(CURL_DISABLE_HTTP_AUTH "disables all HTTP authentication methods" OFF)
|
||||
+option(CURL_DISABLE_HTTP_AUTH "disables all HTTP authentication methods" ON)
|
||||
mark_as_advanced(CURL_DISABLE_HTTP_AUTH)
|
||||
option(CURL_DISABLE_IMAP "disables IMAP" OFF)
|
||||
mark_as_advanced(CURL_DISABLE_IMAP)
|
||||
--- a/Utilities/cmcurl/lib/strerror.c
|
||||
+++ b/Utilities/cmcurl/lib/strerror.c
|
||||
@@ -61,7 +61,7 @@ curl_easy_strerror(CURLcode error)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
We will run cmake ourselves with our flags
|
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -2105,6 +2105,7 @@ export CFLAGS
|
||||
@@ -2110,6 +2110,7 @@ export CFLAGS
|
||||
export CXXFLAGS
|
||||
export LDFLAGS
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -531,12 +531,9 @@ if(BUILD_TESTING)
|
||||
@@ -530,15 +530,9 @@ if(BUILD_TESTING)
|
||||
endif()
|
||||
|
||||
if(NOT CMake_TEST_EXTERNAL_CMAKE)
|
||||
- # Install license file as it requires.
|
||||
- install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR})
|
||||
- install(FILES
|
||||
- "${CMake_LICENSE_FILE}"
|
||||
- "${CMake_SOURCE_DIR}/CONTRIBUTORS.rst"
|
||||
- DESTINATION ${CMAKE_DOC_DIR})
|
||||
-
|
||||
# Install script directories.
|
||||
install(
|
||||
|
|
@ -14,7 +17,7 @@
|
|||
DESTINATION ${CMAKE_DATA_DIR}
|
||||
FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
|
||||
DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
|
||||
@@ -552,9 +549,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
|
||||
@@ -554,9 +548,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
|
||||
REGEX "Help/(dev|guide)($|/)" EXCLUDE
|
||||
)
|
||||
|
||||
|
|
@ -26,7 +29,7 @@
|
|||
configure_file(Source/CMakeInstallSignTool.cmake.in Source/CMakeInstallSignTool.cmake @ONLY)
|
||||
--- a/Source/kwsys/CMakeLists.txt
|
||||
+++ b/Source/kwsys/CMakeLists.txt
|
||||
@@ -607,11 +607,6 @@ if(KWSYS_INSTALL_DOC_DIR)
|
||||
@@ -602,11 +602,6 @@ if(KWSYS_INSTALL_DOC_DIR)
|
||||
COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME}
|
||||
)
|
||||
endif()
|
||||
|
|
@ -40,7 +43,7 @@
|
|||
#-----------------------------------------------------------------------------
|
||||
--- a/Utilities/cmcurl/CMakeLists.txt
|
||||
+++ b/Utilities/cmcurl/CMakeLists.txt
|
||||
@@ -1746,9 +1746,9 @@ if(BUILD_TESTING AND CMAKE_CURL_TEST_URL
|
||||
@@ -2248,9 +2248,9 @@ if(BUILD_TESTING AND CMAKE_CURL_TEST_URL
|
||||
add_test(curl curltest ${CMAKE_CURL_TEST_URL})
|
||||
endif()
|
||||
|
||||
|
|
@ -49,12 +52,12 @@
|
|||
return() # The rest of this file is not needed for building within CMake.
|
||||
+
|
||||
+install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmcurl)
|
||||
# XXX(cmake): end cmake-specific curl code
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
include(GNUInstallDirs)
|
||||
--- a/Utilities/cmlibarchive/CMakeLists.txt
|
||||
+++ b/Utilities/cmlibarchive/CMakeLists.txt
|
||||
@@ -2093,5 +2093,3 @@ add_subdirectory(tar)
|
||||
@@ -2192,5 +2192,3 @@ add_subdirectory(tar)
|
||||
add_subdirectory(cpio)
|
||||
add_subdirectory(unzip)
|
||||
ENDIF()
|
||||
|
|
@ -62,7 +65,7 @@
|
|||
-install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive)
|
||||
--- a/Utilities/cmliblzma/CMakeLists.txt
|
||||
+++ b/Utilities/cmliblzma/CMakeLists.txt
|
||||
@@ -189,5 +189,3 @@ ENDIF()
|
||||
@@ -194,5 +194,3 @@ ENDIF()
|
||||
if(WIN32 AND CMake_BUILD_PCH)
|
||||
target_precompile_headers(cmliblzma PRIVATE "common/mythread.h")
|
||||
endif()
|
||||
|
|
@ -78,7 +81,7 @@
|
|||
-install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibrhash)
|
||||
--- a/Utilities/cmlibuv/CMakeLists.txt
|
||||
+++ b/Utilities/cmlibuv/CMakeLists.txt
|
||||
@@ -354,5 +354,3 @@ set_property(TARGET cmlibuv PROPERTY COM
|
||||
@@ -356,5 +356,3 @@ set_property(TARGET cmlibuv PROPERTY COM
|
||||
if(WIN32 AND CMake_BUILD_PCH)
|
||||
target_precompile_headers(cmlibuv PRIVATE "include/uv.h" "src/win/internal.h")
|
||||
endif()
|
||||
|
|
|
|||
9
srcpkgs/cmake-bootstrap/patches/usleep.patch
Normal file
9
srcpkgs/cmake-bootstrap/patches/usleep.patch
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
--- a/Tests/CTestTestFdSetSize/sleep.c
|
||||
+++ b/Tests/CTestTestFdSetSize/sleep.c
|
||||
@@ -1,3 +1,6 @@
|
||||
+#ifdef __linux__
|
||||
+# include <features.h>
|
||||
+#endif
|
||||
#if defined(_WIN32)
|
||||
# include <windows.h>
|
||||
#elif _XOPEN_SOURCE >= 500 || defined(_ALL_SOURCE)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'cmake-bootstrap'
|
||||
pkgname=cmake-bootstrap
|
||||
version=3.30.1
|
||||
version=4.0.3
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DCMake_INSTALL_INFIX=libexec/xbps-src/
|
||||
|
|
@ -9,16 +9,16 @@ configure_args="-DCMake_INSTALL_INFIX=libexec/xbps-src/
|
|||
-DCMake_ENABLE_DEBUGGER=OFF -DCMAKE_USE_SYSTEM_LIBRARIES=OFF
|
||||
-DCTEST_TEST_CPACK=OFF -DCMake_TEST_NO_NETWORK=ON
|
||||
-DCMake_NO_SELF_BACKTRACE=1 -DKWSYS_LFS_WORKS=1"
|
||||
make_cmd=samu
|
||||
hostmakedepends="samurai"
|
||||
short_desc="CMake for xbps-src"
|
||||
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
|
||||
license="BSD-3-Clause, ICU"
|
||||
homepage="https://www.cmake.org"
|
||||
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
|
||||
checksum=df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1
|
||||
checksum=8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb
|
||||
repository="bootstrap"
|
||||
provides="cmake-${version}_1"
|
||||
make_cmd=samu
|
||||
|
||||
pre_configure() {
|
||||
local f
|
||||
|
|
@ -51,6 +51,11 @@ do_check() {
|
|||
_ignore="${_ignore}|ParseImplicitLinkInfo"
|
||||
# Broken on musl, depends on ldconfig
|
||||
_ignore="${_ignore}|file-GET_RUNTIME_DEPENDENCIES"
|
||||
# tests were designed for Ninja, we run samu
|
||||
_ignore="${_ignore}|RunCMake.CMP0116|RunCMake.Ninja|RunCMake.InstallParallel"
|
||||
_ignore="${_ignore}|RunCMake.BuildDepends|RunCMake.GoogleTest"
|
||||
_ignore="${_ignore}|RunCMake.CommandLine|RunCMake.AutoExportDll"
|
||||
_ignore="${_ignore}|RunCMake.LinkLibrariesStrategy"
|
||||
cd build
|
||||
./bin/ctest -E "${_ignore}"
|
||||
}
|
||||
|
|
@ -59,7 +64,7 @@ post_install() {
|
|||
# We installs license manually because cmake forgets some of them.
|
||||
test ! -d ${DESTDIR}/usr/libexec/xbps-src/share/doc
|
||||
{
|
||||
cat Copyright.txt
|
||||
cat LICENSE.rst
|
||||
printf '%s\n' '' =============================== "FreeBSD ELF library"
|
||||
sed -e '/\$FreeBSD\$/q' Utilities/cmelf/elf_common.h
|
||||
# nghttp2: disabled in curl
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue