From dfcf37b04bd6486f0914da21d8cff8cd2f24a14b 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, 10 Dec 2023 18:21:26 +0700 Subject: [PATCH] cmake: update to 3.29.5. --- .../cmake/patches/ignore-crape-compiler-test.patch | 5 ++--- srcpkgs/cmake/patches/no-license.patch | 4 ++-- srcpkgs/cmake/patches/not-found.patch | 11 +++++++++++ srcpkgs/cmake/template | 4 ++-- 4 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/cmake/patches/not-found.patch diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch index cf098a8f887..850cff297b1 100644 --- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch +++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch @@ -1,11 +1,10 @@ --- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake +++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake -@@ -8,7 +8,7 @@ - set(targets +@@ -9,7 +9,6 @@ set(targets aix-C-XL-13.1.3 aix-CXX-XL-13.1.3 aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1 + aix-C-IBMClang-17.1.1.2 aix-CXX-IBMClang-17.1.1.2 - craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7 -+ craype-Fortran-Cray-8.7 craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0 craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210 diff --git a/srcpkgs/cmake/patches/no-license.patch b/srcpkgs/cmake/patches/no-license.patch index 87e31e21aeb..9154e688502 100644 --- a/srcpkgs/cmake/patches/no-license.patch +++ b/srcpkgs/cmake/patches/no-license.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -522,9 +522,6 @@ if(BUILD_TESTING) +@@ -527,9 +527,6 @@ if(BUILD_TESTING) endif() if(NOT CMake_TEST_EXTERNAL_CMAKE) @@ -12,7 +12,7 @@ DIRECTORY Help Modules Templates --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt -@@ -615,11 +615,6 @@ if(KWSYS_INSTALL_DOC_DIR) +@@ -607,11 +607,6 @@ if(KWSYS_INSTALL_DOC_DIR) COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME} ) endif() diff --git a/srcpkgs/cmake/patches/not-found.patch b/srcpkgs/cmake/patches/not-found.patch new file mode 100644 index 00000000000..f9bd53b8ce1 --- /dev/null +++ b/srcpkgs/cmake/patches/not-found.patch @@ -0,0 +1,11 @@ +--- a/Modules/GetPrerequisites.cmake ++++ b/Modules/GetPrerequisites.cmake +@@ -730,7 +730,7 @@ function(get_prerequisites target prereq + + if(gp_tool MATCHES "ldd$") + set(gp_cmd_args "") +- set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+([^\t\(]+)( \(.+\))?${eol_char}$") ++ set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+(not found|/[^\t\(]+)( \(.+\))?${eol_char}$") + set(gp_regex_error "not found${eol_char}$") + set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$") + set(gp_regex_cmp_count 1) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index e3fbf72cc1c..ae66ffe33cc 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.27.6 +version=3.29.5 revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake @@ -17,7 +17,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=ef3056df528569e0e8956f6cf38806879347ac6de6a4ff7e4105dc4578732cfb +checksum=dd63da7d763c0db455ca232f2c443f5234fe0b11f8bd6958a81d29cc987dfd6e if [ "$XBPS_TARGET_LIBC" = musl ]; then configure_args+=" -DCMake_NO_SELF_BACKTRACE=1"