summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2022-01-04 08:32:20 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2022-05-01 17:05:39 -0500
commite79190d27e6ba9455d7775aa2e40d68c73507709 (patch)
tree1a7cc45627115c8d0e19357b2fa0701cf86d3abe
parent4139ccaa5043ddc8b96abf292a3f70442020cf27 (diff)
downloadpackages-e79190d27e6ba9455d7775aa2e40d68c73507709.tar.gz
packages-e79190d27e6ba9455d7775aa2e40d68c73507709.tar.bz2
packages-e79190d27e6ba9455d7775aa2e40d68c73507709.tar.xz
packages-e79190d27e6ba9455d7775aa2e40d68c73507709.zip
system/cmake: bump { 3.16.4 --> 3.22.1 }. fix gentoo-ism (enable parallel build). disable part of one test. fixes #417.
-rw-r--r--system/cmake/APKBUILD19
1 files changed, 14 insertions, 5 deletions
diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD
index f8570efd9..596ed68bd 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.16.4
+pkgver=3.22.1
pkgrel=0
pkgdesc="Cross-platform build system"
url="https://cmake.org"
@@ -22,12 +22,12 @@ source="https://cmake.org/files/$_v/cmake-${pkgver}.tar.gz"
_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() {
@@ -45,12 +45,21 @@ 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 \
+ ;
}
package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3 cmake-3.16.4.tar.gz"
+sha512sums="b1e900fe573cd1cc76d26386f2298d7722737c9ff67930ee108994972b4561ef69caeb537177c9b95b7f17b755e20e034825d3807ea0d2dd4c391310b03adc11 cmake-3.22.1.tar.gz"