From f5993563d9f6bea26a090c9baf746e625828ae67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 31 Jan 2021 09:19:37 +0700 Subject: [PATCH] cmake: update to 3.19.4. closes #28350 --- .../cmake/patches/0001-Disable-try_run.patch | 27 ------------------- srcpkgs/cmake/template | 7 +++-- 2 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/cmake/patches/0001-Disable-try_run.patch diff --git a/srcpkgs/cmake/patches/0001-Disable-try_run.patch b/srcpkgs/cmake/patches/0001-Disable-try_run.patch deleted file mode 100644 index 3e05af1a581..00000000000 --- a/srcpkgs/cmake/patches/0001-Disable-try_run.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 544abc16419065c009361b9627f69665471cfb6d Mon Sep 17 00:00:00 2001 -From: Nathan Owens -Date: Fri, 20 Nov 2020 22:24:08 -0600 -Subject: [PATCH] Disable try_run - -If cross-building, try_run cannot run during -cross-build so cause build to fail ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git CMakeLists.txt CMakeLists.txt -index 2d860d4..c14a203 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -61,7 +61,7 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") - if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) - message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]") - else() -- _TRY_RUN(${ARGV}) -+ # _TRY_RUN(${ARGV}) - endif() - endmacro() - endif() --- -2.29.2 - diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index b5289095e4a..e95cc40abc7 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,11 +1,12 @@ # Template file for 'cmake' pkgname=cmake -version=3.19.3 +version=3.19.4 revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" make_check_target=test +make_cmd=make hostmakedepends="cmake-bootstrap gcc-fortran" makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel ncurses-devel rhash-devel jsoncpp-devel" @@ -15,7 +16,9 @@ maintainer="Nathan Owens " license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732 +checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1 + +export CMAKE_GENERATOR="Unix Makefiles" pre_check() { # use ctest of this build instead of requirig cmake to test cmake...