Re: [PR PATCH] [Updated] cmake: update to 3.21.1.

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages cmake-3.21.1
https://github.com/void-linux/void-packages/pull/32256

cmake: update to 3.21.1.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32256.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-3.21.1-32256.patch --]
[-- Type: text/x-diff, Size: 6229 bytes --]

From f2dec6a9c9b62e81b297580f805f97a15f18b575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:48 +0700
Subject: [PATCH 1/2] cmake: update to 3.21.1.

---
 .../patches/ignore-crape-compiler-test.patch  | 13 ++++++
 srcpkgs/cmake/patches/test-none.patch         | 41 -------------------
 srcpkgs/cmake/template                        | 11 ++---
 3 files changed, 16 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch

diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ 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
+-  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/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do

From 45d9231b334c63005e6b9764cac9c27b5a3ed41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:56 +0700
Subject: [PATCH 2/2] cmake-gui: update to 3.21.1.

---
 srcpkgs/cmake-gui/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.