diff options
Diffstat (limited to 'system/cmake')
-rw-r--r-- | system/cmake/APKBUILD | 28 | ||||
-rw-r--r-- | system/cmake/fix-tests-git-file-protocol-permission.patch | 21 |
2 files changed, 42 insertions, 7 deletions
diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD index 38bdbf3ad..672caf7e0 100644 --- a/system/cmake/APKBUILD +++ b/system/cmake/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cmake -pkgver=3.15.2 +pkgver=3.23.5 pkgrel=0 pkgdesc="Cross-platform build system" url="https://cmake.org" arch="all" license="CMake" +depends="" +checkdepends="musl-utils file" makedepends="ncurses-dev curl-dev expat-dev zlib-dev bzip2-dev libarchive-dev libuv-dev xz-dev rhash-dev" -checkdepends="musl-utils file" subpackages="$pkgname-doc" case $pkgver in @@ -17,16 +18,18 @@ case $pkgver in *.*.*) _v=v${pkgver%.*};; esac -source="https://cmake.org/files/$_v/cmake-${pkgver}.tar.gz" +source="https://cmake.org/files/$_v/cmake-${pkgver}.tar.gz + fix-tests-git-file-protocol-permission.patch + " _parallel_opt() { local i n - for i in $MAKEOPTS; do + for i in $MAKEFLAGS; do case "$i" in -j*) n=${i#-j};; esac; done - [ -n "$n" ] && echo "--parallel $n" + [ -n "$n" ] && echo "--parallel=$n" } build() { @@ -44,12 +47,23 @@ build() { } check() { + # disable only one part of this test (see #417) + sed -i Tests/RunCMake/ctest_submit/RunCMakeTest.cmake \ + -e '/^run_ctest_submit_FailDrop(https)/d' \ + ; + # skip CTestTestUpload: tries to upload something during check... - CTEST_OUTPUT_ON_FAILURE=TRUE bin/ctest -E CTestTestUpload + #CTEST_PARALLEL_LEVEL=${JOBS} \ + CTEST_OUTPUT_ON_FAILURE=TRUE \ + bin/ctest \ + -E CTestTestUpload \ + -E BundleUtilities \ + ; } package() { make DESTDIR="$pkgdir" install } -sha512sums="154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc cmake-3.15.2.tar.gz" +sha512sums="298f02cd4a0b332184b3e49f343d8a03dcfa637004b0ee9d0a81f72b1ee568aca9caa7322dbf9fe82d9660a8c617f572404cef0c34b2f63297e9211e953cca12 cmake-3.23.5.tar.gz +353cae903076760c77a902256ea6c61102ada60c1ebd05227670cb2bb9aa8f49a4e9946513650f4e58ff94f9a1d108c427d88340b9a633df5376e8036498245e fix-tests-git-file-protocol-permission.patch" diff --git a/system/cmake/fix-tests-git-file-protocol-permission.patch b/system/cmake/fix-tests-git-file-protocol-permission.patch new file mode 100644 index 000000000..c43d9a146 --- /dev/null +++ b/system/cmake/fix-tests-git-file-protocol-permission.patch @@ -0,0 +1,21 @@ +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 |