cmake-bootstrap: update to 3.29.5.

This commit is contained in:
Đoàn Trần Công Danh 2024-06-13 14:35:28 +07:00
parent b6a3555896
commit 44156f322a
4 changed files with 93 additions and 77 deletions

View file

@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,15 +245,13 @@ macro(CMAKE_SETUP_TESTING)
@@ -247,15 +247,13 @@ macro(CMAKE_SETUP_TESTING)
if(CMake_TEST_EXTERNAL_CMAKE)
set(CMAKE_CTEST_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/ctest")
set(CMAKE_CMAKE_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cmake")
@ -17,7 +17,7 @@
endif()
endif()
@@ -462,7 +460,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
@@ -467,7 +465,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
@@ -1039,6 +1039,7 @@ target_link_libraries(CTestLib PUBLIC CM
@@ -1126,6 +1126,7 @@ endif()
#
# Build CPackLib
#
@ -35,7 +35,7 @@
add_library(
CPackLib
CPack/cmCPackArchiveGenerator.cxx
@@ -1071,9 +1072,10 @@ target_include_directories(
@@ -1158,9 +1159,10 @@ target_include_directories(
"${CMAKE_CURRENT_BINARY_DIR}/CPack"
)
target_link_libraries(CPackLib PUBLIC CMakeLib)
@ -47,7 +47,7 @@
target_sources(
CPackLib
PRIVATE
@@ -1191,11 +1193,6 @@ add_executable(ctest ctest.cxx)
@@ -1278,11 +1280,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
@@ -143,7 +143,6 @@ if(BUILD_TESTING)
@@ -147,7 +147,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
@@ -816,9 +816,6 @@ add_RunCMake_test(file-GET_RUNTIME_DEPEN
@@ -908,9 +908,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()
@@ -837,9 +834,6 @@ add_RunCMake_test(CTestCommandLine -DTES
@@ -932,9 +929,6 @@ add_RunCMake_test(CTestCommandLine -DTES
add_RunCMake_test(CacheNewline)
# Only run this test on unix platforms that support
# symbolic links
@ -91,40 +91,42 @@
set(IfacePaths_INCDIRS_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
add_RunCMake_test(IfacePaths_INCDIRS TEST_DIR IfacePaths)
@@ -970,8 +964,6 @@ set(cpack_tests
if(APPLE)
list(APPEND cpack_tests DragNDrop)
@@ -1098,8 +1092,6 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k"
endif()
endif()
-add_RunCMake_test_group(CPack "${cpack_tests}")
-# add a test to make sure symbols are exported from a shared library
# for MSVC compilers CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS property is used
add_RunCMake_test(AutoExportDll
-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
@@ -1015,27 +1007,6 @@ add_RunCMake_test(PrecompileHeaders -DCM
@@ -1143,29 +1135,6 @@ add_RunCMake_test(PrecompileHeaders -DCM
-DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION})
add_RunCMake_test("UnityBuild")
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}
- )
-add_RunCMake_test(CMakePresetsBuild
- -DPython_EXECUTABLE=${Python_EXECUTABLE}
- -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
- -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
- )
-add_RunCMake_test(CMakePresetsTest
- -DPython_EXECUTABLE=${Python_EXECUTABLE}
- -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
- )
-add_RunCMake_test(CMakePresetsPackage
- -DPython_EXECUTABLE=${Python_EXECUTABLE}
- -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
- )
-if(NOT CMake_TEST_E2K_BROKEN_LIBC)
- add_RunCMake_test(CMakePresetsBuild
- -DPython_EXECUTABLE=${Python_EXECUTABLE}
- -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
- -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
- )
- add_RunCMake_test(CMakePresetsTest
- -DPython_EXECUTABLE=${Python_EXECUTABLE}
- -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
- )
- add_RunCMake_test(CMakePresetsPackage
- -DPython_EXECUTABLE=${Python_EXECUTABLE}
- -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
- )
-endif()
-add_RunCMake_test(CMakePresetsWorkflow
- -DPython_EXECUTABLE=${Python_EXECUTABLE}
- -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
- )
add_RunCMake_test(VerifyHeaderSets)
add_RunCMake_test(set_tests_properties)

View file

@ -1,6 +1,6 @@
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -1990,9 +1990,6 @@ bool HandleDownloadCommand(std::vector<s
@@ -2082,9 +2082,6 @@ bool HandleDownloadCommand(std::vector<s
res = ::curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
check_curl_result(res, "DOWNLOAD cannot set http failure option: ");
@ -10,7 +10,7 @@
res = ::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cmWriteToFileCallback);
check_curl_result(res, "DOWNLOAD cannot set write function: ");
@@ -2000,15 +1997,6 @@ bool HandleDownloadCommand(std::vector<s
@@ -2092,15 +2089,6 @@ bool HandleDownloadCommand(std::vector<s
cmFileCommandCurlDebugCallback);
check_curl_result(res, "DOWNLOAD cannot set debug function: ");
@ -26,7 +26,7 @@
for (const auto& range : curl_ranges) {
std::string curl_range = range.first + '-' +
(range.second.has_value() ? range.second.value() : "");
@@ -2043,25 +2031,11 @@ bool HandleDownloadCommand(std::vector<s
@@ -2135,25 +2123,11 @@ bool HandleDownloadCommand(std::vector<s
res = ::curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &chunkDebug);
check_curl_result(res, "DOWNLOAD cannot set debug data: ");
@ -52,7 +52,7 @@
// 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)"
@@ -2331,15 +2305,6 @@ bool HandleUploadCommand(std::vector<std
@@ -2423,15 +2397,6 @@ bool HandleUploadCommand(std::vector<std
cmFileCommandCurlDebugCallback);
check_curl_result(res, "UPLOAD cannot set debug function: ");
@ -68,7 +68,7 @@
// check to see if a CAINFO file has been specified
// command arg comes first
std::string const& cainfo_err = cmCurlSetCAInfo(curl, cainfo);
@@ -2357,25 +2322,11 @@ bool HandleUploadCommand(std::vector<std
@@ -2449,25 +2414,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 +96,7 @@
// scope intentionally, rather than inside the "if(showProgress)"
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -483,7 +483,6 @@ if(COVERAGE_COMMAND)
@@ -540,7 +540,6 @@ if(COVERAGE_COMMAND)
add_RunCMake_test(ctest_coverage -DCOVERAGE_COMMAND=${COVERAGE_COMMAND})
endif()
add_RunCMake_test(ctest_start)
@ -104,33 +104,34 @@
add_RunCMake_test(ctest_test
-DIMAGE_DIR=${CMAKE_SOURCE_DIR}/Utilities/Sphinx/static
)
@@ -504,7 +503,6 @@ foreach(var
@@ -562,7 +561,6 @@ foreach(var
list(APPEND file-DOWNLOAD_ARGS -D${var}=${${var}})
endif()
endforeach()
-add_RunCMake_test(file-DOWNLOAD)
add_RunCMake_test(file-RPATH -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME})
add_RunCMake_test(find_file)
add_RunCMake_test(find_library -DCYGWIN=${CYGWIN} -DMSYS=${MSYS})
add_RunCMake_test(file-STRINGS)
add_RunCMake_test(find_file -DMINGW=${MINGW})
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -22,12 +22,12 @@ set(CURL_DISABLE_CRYPTO_AUTH OFF CACHE I
set(CURL_DISABLE_DICT ON CACHE INTERNAL "Disable curl dict protocol?")
@@ -29,13 +29,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)
-set(CURL_DISABLE_FTP OFF CACHE INTERNAL "Disable curl ftp protocol?")
+set(CURL_DISABLE_FTP ON CACHE INTERNAL "Disable curl ftp protocol?")
set(CURL_DISABLE_GETOPTIONS OFF)
set(CURL_DISABLE_GOPHER ON CACHE INTERNAL "Disable curl gopher protocol?")
set(CURL_DISABLE_HSTS ON)
set(CURL_DISABLE_HEADERS_API OFF)
set(CURL_DISABLE_HSTS OFF)
-set(CURL_DISABLE_HTTP_AUTH OFF)
-set(CURL_DISABLE_HTTP OFF CACHE INTERNAL "Disable curl http protocol?")
+set(CURL_DISABLE_HTTP_AUTH ON)
+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_LDAP ON CACHE INTERNAL "Disable curl ldap protocol?")
set(CURL_DISABLE_LDAPS ON CACHE INTERNAL "Disable curl ldaps protocol?")
@@ -40,12 +40,12 @@ set(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFI
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_PARSEDATE OFF)
set(CURL_DISABLE_POP3 ON CACHE INTERNAL "Disable curl pop3 protocol?")
set(CURL_DISABLE_PROGRESS_METER OFF)
@ -142,10 +143,10 @@
set(CURL_DISABLE_SMTP ON CACHE INTERNAL "Disable curl smtp protocol?")
-set(CURL_DISABLE_SOCKETPAIR OFF)
+set(CURL_DISABLE_SOCKETPAIR ON)
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?")
set(CURL_DISABLE_VERBOSE_STRINGS OFF CACHE INTERNAL "Do not disable curl verbosity")
@@ -61,7 +61,7 @@ set(ENABLE_ALT_SVC OFF)
@@ -73,7 +73,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.")
@ -154,10 +155,10 @@
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)
@@ -77,8 +77,8 @@ set(HAVE_STRCASECMP 0) # we do not vendo
set(HAVE_WIN32_WINNT 0) # we do not need this info
@@ -90,8 +90,8 @@ set(HAVE_WIN32_WINNT 0) # we do not need
set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only")
set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options")
set(SHARE_LIB_OBJECT OFF)
-set(USE_LIBIDN2 ON)
-set(USE_NGHTTP2 ON)
+set(USE_LIBIDN2 OFF)
@ -165,15 +166,29 @@
set(USE_NGTCP2 OFF)
set(USE_QUICHE OFF)
set(USE_WIN32_IDN OFF)
@@ -323,7 +323,7 @@ option(CURL_DISABLE_DOH "disables DNS-ov
mark_as_advanced(CURL_DISABLE_DOH)
option(CURL_DISABLE_FILE "disables FILE" OFF)
mark_as_advanced(CURL_DISABLE_FILE)
@@ -366,11 +366,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)
@@ -378,7 +378,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)

View file

@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -522,12 +522,9 @@ if(BUILD_TESTING)
@@ -524,12 +524,9 @@ if(BUILD_TESTING)
endif()
if(NOT CMake_TEST_EXTERNAL_CMAKE)
@ -14,7 +14,7 @@
DESTINATION ${CMAKE_DATA_DIR}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
@@ -543,9 +540,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
@@ -545,9 +542,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
REGEX "Help/(dev|guide)($|/)" EXCLUDE
)
@ -26,7 +26,7 @@
configure_file(Source/CMakeInstallSignTool.cmake.in Source/CMakeInstallSignTool.cmake @ONLY)
--- a/Source/kwsys/CMakeLists.txt
+++ b/Source/kwsys/CMakeLists.txt
@@ -615,11 +615,6 @@ if(KWSYS_INSTALL_DOC_DIR)
@@ -607,11 +607,6 @@ if(KWSYS_INSTALL_DOC_DIR)
COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME}
)
endif()
@ -40,45 +40,48 @@
#-----------------------------------------------------------------------------
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -1579,8 +1579,6 @@ target_link_libraries(curltest cmcurl)
if(BUILD_TESTING AND CMAKE_CURL_TEST_URL)
@@ -1657,9 +1657,9 @@ if(BUILD_TESTING AND CMAKE_CURL_TEST_URL
add_test(curl curltest ${CMAKE_CURL_TEST_URL})
endif()
-
-install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmcurl)
-
return() # The rest of this file is not needed for building within CMake.
+
+install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmcurl)
#-----------------------------------------------------------------------------
if(0) # This code not needed for building within CMake.
include(GNUInstallDirs)
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -2077,5 +2077,3 @@ add_subdirectory(cat)
add_subdirectory(tar)
@@ -2093,5 +2093,3 @@ add_subdirectory(tar)
add_subdirectory(cpio)
add_subdirectory(unzip)
ENDIF()
-
-install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive)
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@ -185,5 +185,3 @@ ELSEIF((CMAKE_C_COMPILER_ID STREQUAL "GN
# Disable the old GNU compiler optimizer.
SET_PROPERTY(TARGET cmliblzma PROPERTY COMPILE_FLAGS "-O0")
ENDIF()
@@ -189,5 +189,3 @@ ENDIF()
if(WIN32 AND CMake_BUILD_PCH)
target_precompile_headers(cmliblzma PRIVATE "common/mythread.h")
endif()
-
-INSTALL(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmliblzma)
--- a/Utilities/cmlibrhash/CMakeLists.txt
+++ b/Utilities/cmlibrhash/CMakeLists.txt
@@ -36,5 +36,3 @@ include_directories(
)
@@ -38,5 +38,3 @@ include_directories(
add_library(cmlibrhash ${librhash_sources})
target_compile_definitions(cmlibrhash PRIVATE NO_IMPORT_EXPORT)
-
-install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibrhash)
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -364,5 +364,3 @@ include_directories(
add_library(cmlibuv STATIC ${uv_sources})
target_link_libraries(cmlibuv ${uv_libraries})
set_property(TARGET cmlibuv PROPERTY COMPILE_DEFINITIONS ${uv_defines})
@@ -354,5 +354,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()
-
-install(FILES LICENSE DESTINATION ${CMAKE_DOC_DIR}/cmlibuv)
--- a/Utilities/cmnghttp2/CMakeLists.txt

View file

@ -1,27 +1,23 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
version=3.27.6
revision=2
version=3.29.5
revision=1
build_style=cmake
configure_args="-DCMake_INSTALL_INFIX=libexec/xbps-src/
-DCMAKE_SKIP_BOOTSTRAP_TEST=1 -DCMAKE_SKIP_RPATH=OFF
-DCMAKE_USE_OPENSSL=OFF -DBUILD_CursesDialog=OFF -DBUILD_QtDialog=OFF
-DCMake_ENABLE_DEBUGGER=OFF -DCMAKE_USE_SYSTEM_LIBRARIES=OFF
-DCTEST_TEST_CPACK=OFF -DCMake_TEST_NO_NETWORK=ON
-DKWSYS_LFS_WORKS=1"
-DCMake_NO_SELF_BACKTRACE=1 -DKWSYS_LFS_WORKS=1"
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=ef3056df528569e0e8956f6cf38806879347ac6de6a4ff7e4105dc4578732cfb
checksum=dd63da7d763c0db455ca232f2c443f5234fe0b11f8bd6958a81d29cc987dfd6e
repository="bootstrap"
provides="cmake-${version}_1"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
configure_args+=" -DCMake_NO_SELF_BACKTRACE=1"
fi
pre_configure() {
local f
rm -rf build