From 8f95b16a7a98f318576859fb9c6c68b07632bf47 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 19 Nov 2020 19:02:23 -0600 Subject: [PATCH] cmake: update to 3.19.0 --- .../cmake/patches/0001-Disable-try_run.patch | 27 +++++++++++++++++++ srcpkgs/cmake/template | 4 +-- 2 files changed, 29 insertions(+), 2 deletions(-) create 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 new file mode 100644 index 00000000000..3e05af1a581 --- /dev/null +++ b/srcpkgs/cmake/patches/0001-Disable-try_run.patch @@ -0,0 +1,27 @@ +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 0955f2595fa..24dc0785af9 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.18.4 +version=3.19.0 revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake @@ -20,7 +20,7 @@ maintainer="Nathan Owens " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 +checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493 pre_check() { # use ctest of this build instead of requirig cmake to test cmake...