diff options
Diffstat (limited to 'system/cmake')
| -rw-r--r-- | system/cmake/APKBUILD | 17 | ||||
| -rw-r--r-- | system/cmake/fix-tests-git-file-protocol-permission.patch | 21 | ||||
| -rw-r--r-- | system/cmake/musl-ldso.patch | 5 |
3 files changed, 15 insertions, 28 deletions
diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD index 672caf7e0..983dd5335 100644 --- a/system/cmake/APKBUILD +++ b/system/cmake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cmake -pkgver=3.23.5 +pkgver=3.31.8 pkgrel=0 pkgdesc="Cross-platform build system" url="https://cmake.org" @@ -19,7 +19,7 @@ case $pkgver in esac source="https://cmake.org/files/$_v/cmake-${pkgver}.tar.gz - fix-tests-git-file-protocol-permission.patch + musl-ldso.patch " _parallel_opt() { @@ -41,6 +41,7 @@ build() { --datadir=/share/$pkgname \ --docdir=/share/doc/$pkgname \ --system-libs \ + --no-system-cppdap \ --no-system-jsoncpp \ $(_parallel_opt) make @@ -53,11 +54,13 @@ check() { ; # skip CTestTestUpload: tries to upload something during check... - #CTEST_PARALLEL_LEVEL=${JOBS} \ + # BundleUtilities fails in autobuilder env due to LD_PRELOAD hack + # RunCMake.CrosscompilingEmulator and RunCMake.add_test don't support + # running with parallel level > 1. + CTEST_PARALLEL_LEVEL=${JOBS} \ CTEST_OUTPUT_ON_FAILURE=TRUE \ bin/ctest \ - -E CTestTestUpload \ - -E BundleUtilities \ + -E '(CTestTestUpload|BundleUtilities|RunCMake\.(CrosscompilingEmulator|add_test))' \ ; } @@ -65,5 +68,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="298f02cd4a0b332184b3e49f343d8a03dcfa637004b0ee9d0a81f72b1ee568aca9caa7322dbf9fe82d9660a8c617f572404cef0c34b2f63297e9211e953cca12 cmake-3.23.5.tar.gz -353cae903076760c77a902256ea6c61102ada60c1ebd05227670cb2bb9aa8f49a4e9946513650f4e58ff94f9a1d108c427d88340b9a633df5376e8036498245e fix-tests-git-file-protocol-permission.patch" +sha512sums="07dbb5af1d449760ef92a921e43c0a0a091989ac51ce3f8b7607bf617b8b56e47c675486d3c620c04f1105b7dfa3852b926915e0888ff46ea473cd01e572f461 cmake-3.31.8.tar.gz +4ad2da9781f55686f4c5dbbb93f909748097f23760208a81109117b3b0976e02f2228253c3a916a6b26575a27f8b67012d2458c35a9cacf6668261d8cede9582 musl-ldso.patch" diff --git a/system/cmake/fix-tests-git-file-protocol-permission.patch b/system/cmake/fix-tests-git-file-protocol-permission.patch deleted file mode 100644 index c43d9a146..000000000 --- a/system/cmake/fix-tests-git-file-protocol-permission.patch +++ /dev/null @@ -1,21 +0,0 @@ -Backported: https://github.com/Kitware/CMake/commit/79ce0f434e916684d734e136b92e14f472a9d14a - -diff -ur a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt ---- a/Tests/CMakeLists.txt 2022-11-01 08:36:33.000000000 -0500 -+++ b/Tests/CMakeLists.txt 2023-02-28 15:24:14.294747915 -0600 -@@ -1586,6 +1586,7 @@ - ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProject") - set_tests_properties(ExternalProject PROPERTIES -+ ENVIRONMENT GIT_ALLOW_PROTOCOL=file - RUN_SERIAL 1 - TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT}) - -@@ -2678,6 +2679,7 @@ - -P "${CMake_BINARY_DIR}/Tests/CTestUpdateGIT.cmake" - ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateGIT_DIR}") -+ set_property(TEST CTest.UpdateGIT PROPERTY ENVIRONMENT GIT_ALLOW_PROTOCOL=file) - endif() - - # Test CTest Update with HG diff --git a/system/cmake/musl-ldso.patch b/system/cmake/musl-ldso.patch new file mode 100644 index 000000000..7fd68e374 --- /dev/null +++ b/system/cmake/musl-ldso.patch @@ -0,0 +1,5 @@ +--- cmake-3.31.8/Tests/RunCMake/RuntimePath/Stub-fail-stderr.txt.old 2025-06-12 08:51:05.000000000 -0500 ++++ cmake-3.31.8/Tests/RunCMake/RuntimePath/Stub-fail-stderr.txt 2025-06-16 19:11:24.657917052 -0500 +@@ -1 +1 @@ +-(error while loading shared libraries: libStub\.so\.1|Library not loaded: '?@rpath/libStub\.1\.dylib'?|(Cannot|Could not) load module libStub\.a\(libStub\.so\.1\)|fatal: libStub\.so\.1: open failed|Shared object "libStub\.so\.1" not found) ++(Error loading shared library libStub\.so\.1|error while loading shared libraries: libStub\.so\.1|Library not loaded: '?@rpath/libStub\.1\.dylib'?|(Cannot|Could not) load module libStub\.a\(libStub\.so\.1\)|fatal: libStub\.so\.1: open failed|Shared object "libStub\.so\.1" not found) |