diff options
| -rw-r--r-- | internal/rosa/llvm_test.go | 2 | ||||
| -rw-r--r-- | internal/rosa/package/cmake/bootstrap-test-no-openssl.patch | 13 | ||||
| -rw-r--r-- | internal/rosa/package/cmake/package.az | 10 |
3 files changed, 5 insertions, 20 deletions
diff --git a/internal/rosa/llvm_test.go b/internal/rosa/llvm_test.go index 40f31903..5af4265c 100644 --- a/internal/rosa/llvm_test.go +++ b/internal/rosa/llvm_test.go @@ -8,7 +8,7 @@ import ( ) func TestLLVMInputs(t *testing.T) { - const wantInputCount = 553 + const wantInputCount = 550 _, llvm := rosa.Native().Std().MustLoad(rosa.H("llvm")) var n int diff --git a/internal/rosa/package/cmake/bootstrap-test-no-openssl.patch b/internal/rosa/package/cmake/bootstrap-test-no-openssl.patch deleted file mode 100644 index a156fb8e..00000000 --- a/internal/rosa/package/cmake/bootstrap-test-no-openssl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Tests/BootstrapTest.cmake b/Tests/BootstrapTest.cmake -index 137de78bc1..b4da52e664 100644 ---- a/Tests/BootstrapTest.cmake -+++ b/Tests/BootstrapTest.cmake -@@ -9,7 +9,7 @@ if(NOT nproc EQUAL 0) - endif() - message(STATUS "running bootstrap: ${bootstrap} ${ninja_arg} ${parallel_arg}") - execute_process( -- COMMAND ${bootstrap} ${ninja_arg} ${parallel_arg} -+ COMMAND ${bootstrap} ${ninja_arg} ${parallel_arg} -- -DCMAKE_USE_OPENSSL=OFF - WORKING_DIRECTORY "${bin_dir}" - RESULT_VARIABLE result - ) diff --git a/internal/rosa/package/cmake/package.az b/internal/rosa/package/cmake/package.az index 4856f170..a98fc671 100644 --- a/internal/rosa/package/cmake/package.az +++ b/internal/rosa/package/cmake/package.az @@ -3,18 +3,15 @@ package cmake { website = "https://cmake.org"; anitya = 306; - version# = "4.3.4"; + version# = "4.4.0"; source = remoteGitHubRelease { suffix = "Kitware/CMake"; tag = "v"+version; name = "cmake-"+version+".tar.gz"; - checksum = "6A50pqarKDXKOCv7ffKMvWJWmNTVp_ep8KoaWwNdg-RYQRddgKbxayHveTo6jZ_7"; + checksum = "ZL0Y19_mSJWsl3dMjRRQJAaCvl4_PqbwpgUC1aBA-cdVdrK_gt4ylpUM2GMoQMku"; compress = gzip; }; - patches = [ - "bootstrap-test-no-openssl.patch", - "disable-broken-tests-musl.patch", - ]; + patches = [ "disable-broken-tests-musl.patch" ]; // test suite expects writable source tree writable = true; @@ -32,6 +29,7 @@ package cmake { "--"; "-DCMAKE_USE_OPENSSL": "OFF"; "-DCMake_TEST_NO_NETWORK": "ON"; + "-DCMake_TEST_BOOTSTRAP": "OFF"; }; check = [ |