diff --git a/srcpkgs/cmake-bootstrap/patches/no-cpack.patch b/srcpkgs/cmake-bootstrap/patches/no-cpack.patch index 48c9a46f500..7b20b60d297 100644 --- a/srcpkgs/cmake-bootstrap/patches/no-cpack.patch +++ b/srcpkgs/cmake-bootstrap/patches/no-cpack.patch @@ -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) diff --git a/srcpkgs/cmake-bootstrap/patches/no-network.patch b/srcpkgs/cmake-bootstrap/patches/no-network.patch index 5d2d8bec2a5..f68c96b4a1e 100644 --- a/srcpkgs/cmake-bootstrap/patches/no-network.patch +++ b/srcpkgs/cmake-bootstrap/patches/no-network.patch @@ -1,6 +1,6 @@ --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx -@@ -1990,9 +1990,6 @@ bool HandleDownloadCommand(std::vector