[PR PATCH] [WiP] build-style/cmake: use ninja as default generator

[PR PATCH] [WiP] build-style/cmake: use ninja as default generator

[Johnnynator]

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

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages cmake
https://github.com/void-linux/void-packages/pull/28304

[WiP] build-style/cmake: use ninja as default generator
<!-- Mark items with [x] where applicable -->

There are probably packages broken with it.

#### 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/28304.patch is attached

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

From fb05b962d6b4b0e89d7bd420737694430dd7f5fe Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:24:17 +0100
Subject: [PATCH] build-style/cmake: use ninja as default generator

---
 common/build-style/cmake.sh             | 8 ++++----
 common/environment/build-style/cmake.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 3135508b8b0..b8b070dbf32 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -64,7 +64,7 @@ _EOF
 
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-		cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
+		cmake ${cmake_args} -GNinja ${configure_args} $(echo ${cmake_builddir}|sed \
 			-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
 
 	# Replace -isystem with -I for Qt4 and Qt5 packages
@@ -72,7 +72,7 @@ _EOF
 }
 
 do_build() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 
 	cd ${cmake_builddir:=build}
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
@@ -92,14 +92,14 @@ do_check() {
 		fi
 	fi
 
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_check_target:=test}
 
 	CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_install_target:=install}
 
 	cd ${cmake_builddir:=build}
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 25bd8a388ec..c9e4d896159 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,5 +1,5 @@
 if [ "$CHROOT_READY" ]; then
 	if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
-		hostmakedepends+=" cmake"
+		hostmakedepends+=" cmake ninja"
 	fi
 fi

Re: [PR PATCH] [Updated] [WiP] build-style/cmake: use ninja as default generator

[Johnnynator]

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

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

https://github.com/Johnnynator/void-packages cmake
https://github.com/void-linux/void-packages/pull/28304

[WiP] build-style/cmake: use ninja as default generator
<!-- Mark items with [x] where applicable -->

There are probably packages broken with it.

#### 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/28304.patch is attached

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

From fb05b962d6b4b0e89d7bd420737694430dd7f5fe Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:24:17 +0100
Subject: [PATCH 1/2] build-style/cmake: use ninja as default generator

---
 common/build-style/cmake.sh             | 8 ++++----
 common/environment/build-style/cmake.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 3135508b8b0..b8b070dbf32 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -64,7 +64,7 @@ _EOF
 
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-		cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
+		cmake ${cmake_args} -GNinja ${configure_args} $(echo ${cmake_builddir}|sed \
 			-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
 
 	# Replace -isystem with -I for Qt4 and Qt5 packages
@@ -72,7 +72,7 @@ _EOF
 }
 
 do_build() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 
 	cd ${cmake_builddir:=build}
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
@@ -92,14 +92,14 @@ do_check() {
 		fi
 	fi
 
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_check_target:=test}
 
 	CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_install_target:=install}
 
 	cd ${cmake_builddir:=build}
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 25bd8a388ec..c9e4d896159 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,5 +1,5 @@
 if [ "$CHROOT_READY" ]; then
 	if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
-		hostmakedepends+=" cmake"
+		hostmakedepends+=" cmake ninja"
 	fi
 fi

From c060d9d4c481f469b616964da349984549b6c34d Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:30:11 +0100
Subject: [PATCH 2/2] ccache: force bootstrap build to use gnu-make

---
 srcpkgs/ccache/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 8b46fdd4686..52e60be6fcb 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -16,6 +16,8 @@ checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
 
 if [ -z "$CHROOT_READY" ]; then
 	hostmakedepends="cmake-bootstrap"
+	configure_args+=" -G'Unix Makefiles'"
+	make_cmd="make"
 else
 	hostmakedepends="asciidoc perl"
 fi

Re: [WiP] build-style/cmake: use ninja as default generator

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#issuecomment-769879736

Comment:
Would require fixing any templates that call `make` explicitly in some phase. Will be a lot of work :P

Re: [PR PATCH] [Updated] [WiP] build-style/cmake: use ninja as default generator

[Johnnynator]

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

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

https://github.com/Johnnynator/void-packages cmake
https://github.com/void-linux/void-packages/pull/28304

[WiP] build-style/cmake: use ninja as default generator
<!-- Mark items with [x] where applicable -->

There are probably packages broken with it.

#### 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/28304.patch is attached

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

From fb05b962d6b4b0e89d7bd420737694430dd7f5fe Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:24:17 +0100
Subject: [PATCH 1/3] build-style/cmake: use ninja as default generator

---
 common/build-style/cmake.sh             | 8 ++++----
 common/environment/build-style/cmake.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 3135508b8b0..b8b070dbf32 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -64,7 +64,7 @@ _EOF
 
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-		cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
+		cmake ${cmake_args} -GNinja ${configure_args} $(echo ${cmake_builddir}|sed \
 			-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
 
 	# Replace -isystem with -I for Qt4 and Qt5 packages
@@ -72,7 +72,7 @@ _EOF
 }
 
 do_build() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 
 	cd ${cmake_builddir:=build}
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
@@ -92,14 +92,14 @@ do_check() {
 		fi
 	fi
 
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_check_target:=test}
 
 	CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_install_target:=install}
 
 	cd ${cmake_builddir:=build}
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 25bd8a388ec..c9e4d896159 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,5 +1,5 @@
 if [ "$CHROOT_READY" ]; then
 	if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
-		hostmakedepends+=" cmake"
+		hostmakedepends+=" cmake ninja"
 	fi
 fi

From c060d9d4c481f469b616964da349984549b6c34d Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:30:11 +0100
Subject: [PATCH 2/3] ccache: force bootstrap build to use gnu-make

---
 srcpkgs/ccache/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 8b46fdd4686..52e60be6fcb 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -16,6 +16,8 @@ checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
 
 if [ -z "$CHROOT_READY" ]; then
 	hostmakedepends="cmake-bootstrap"
+	configure_args+=" -G'Unix Makefiles'"
+	make_cmd="make"
 else
 	hostmakedepends="asciidoc perl"
 fi

From 7d8b697420d590bc8d2e8c41e413b75706f88821 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:47:02 +0100
Subject: [PATCH 3/3] build-style/cmake: replace sed monstrosity with
 ${wrksrc}/${build_wrksrc}

---
 common/build-style/cmake.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index b8b070dbf32..6078ede1f49 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -64,8 +64,7 @@ _EOF
 
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-		cmake ${cmake_args} -GNinja ${configure_args} $(echo ${cmake_builddir}|sed \
-			-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
+		cmake ${cmake_args} -GNinja ${configure_args} ${wrksrc}/${build_wrksrc}
 
 	# Replace -isystem with -I for Qt4 and Qt5 packages
 	find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r567164191

Comment:
 Is there any other problematic packages? In that case, we would want to have a variable like `cmake_use_make`?

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[Johnnynator]

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r567164710

Comment:
I do not know yet. Feel free to test build every package that use the cmake build style.

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r567351971

Comment:
`cmake` itself is built with `build_style=cmake`, and has `cmake-bootstrap` in `hostmakedepends`.
I suppose we should keep `cmake` with `-G'Unix Makefiles'`?

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r567352216

Comment:
`cmake-bootstrap` doesn't know how to generate Ninja, so I'll add `-G'Unix Makefiles'` to `cmake`'s `configure_args`

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r567353558

Comment:
`configure_args+'" -G'Unix Makefiles'"` doesn't work.

> CMake Error: Could not create named generator 'Unix

I think we're better to do this instead:
```diff
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 6078ede1f4..26d55f527e 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -62,9 +62,10 @@ _EOF
 
 	cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
 
+	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-		cmake ${cmake_args} -GNinja ${configure_args} ${wrksrc}/${build_wrksrc}
+		cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}
 
 	# Replace -isystem with -I for Qt4 and Qt5 packages
 	find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 52e60be6fc..9f42aa4731 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -16,7 +16,7 @@ checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
 
 if [ -z "$CHROOT_READY" ]; then
 	hostmakedepends="cmake-bootstrap"
-	configure_args+=" -G'Unix Makefiles'"
+	export CMAKE_GENERATOR="Unix Makefiles"
 	make_cmd="make"
 else
 	hostmakedepends="asciidoc perl"
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index e3e59a31fb..cb351b5b75 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -17,6 +17,8 @@ homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 pre_check() {
 	# use ctest of this build instead of requirig cmake to test cmake...
 	vsed -i "${wrksrc}/build/Makefile" \
```

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r567353658

Comment:
`-G 'Unix Makefiles'` (with a space) does seem to work

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r567354786

Comment:
Anyway, the issue could be that it's losing the quotes, so instead it received two arguments: `-G'Unix` and `Makefiles'`.

If we switch to the env var, I'd suggest using the same env var for selecting ninja.

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r567353658

Comment:
`-G 'Unix Makefiles'` (with a space) does seem to work (in a terminal, not inside xbps)

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r570816924

Comment:
What is the consensus for this one?

Re: [PR REVIEW] [WiP] build-style/cmake: use ninja as default generator

[Johnnynator]

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/28304#discussion_r571949359

Comment:
Going with `CMAKE_GENERATOR` env looks to be cleaner than going the route of adding it to configure_args. So I'd say we go with that.

Re: [PR PATCH] [Updated] [WiP] build-style/cmake: use ninja as default generator

[Johnnynator]

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

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

https://github.com/Johnnynator/void-packages cmake
https://github.com/void-linux/void-packages/pull/28304

[WiP] build-style/cmake: use ninja as default generator
<!-- Mark items with [x] where applicable -->

There are probably packages broken with it.

#### 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/28304.patch is attached

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

From 38138a0f0173e33ac344c90296f4d060d098c3e3 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:24:17 +0100
Subject: [PATCH 01/34] build-style/cmake: use ninja as default generator

---
 common/build-style/cmake.sh             | 7 ++++---
 common/environment/build-style/cmake.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 3135508b8b0..5e4f2dadc8c 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -62,6 +62,7 @@ _EOF
 
 	cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
 
+	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
 		cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
@@ -72,7 +73,7 @@ _EOF
 }
 
 do_build() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 
 	cd ${cmake_builddir:=build}
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
@@ -92,14 +93,14 @@ do_check() {
 		fi
 	fi
 
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_check_target:=test}
 
 	CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_install_target:=install}
 
 	cd ${cmake_builddir:=build}
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 25bd8a388ec..c9e4d896159 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,5 +1,5 @@
 if [ "$CHROOT_READY" ]; then
 	if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
-		hostmakedepends+=" cmake"
+		hostmakedepends+=" cmake ninja"
 	fi
 fi

From 4d43533b307da3fa9526ee152b9da7ad4d53db2a Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:30:11 +0100
Subject: [PATCH 02/34] ccache: force bootstrap build to use gnu-make

---
 srcpkgs/ccache/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 25e948cf79e..c7b94db6d67 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -16,6 +16,8 @@ checksum=2f14b11888c39778c93814fc6843fc25ad60ff6ba4eeee3dff29a1bad67ba94f
 
 if [ -z "$CHROOT_READY" ]; then
 	hostmakedepends="cmake-bootstrap"
+	export CMAKE_GENERATOR="Unix Makefiles"
+	make_cmd="make"
 else
 	hostmakedepends="asciidoc perl"
 fi

From 19d0edb345433402394b59c7d942fffe4b0a184b Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:47:02 +0100
Subject: [PATCH 03/34] build-style/cmake: replace sed monstrosity with
 ${wrksrc}/${build_wrksrc}

---
 common/build-style/cmake.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 5e4f2dadc8c..26d55f527e3 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -65,8 +65,7 @@ _EOF
 	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-		cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
-			-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
+		cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}
 
 	# Replace -isystem with -I for Qt4 and Qt5 packages
 	find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;

From 5ca08e08fa38d4c72ccac286f9638de2ca01e4c3 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: Sun, 31 Jan 2021 09:19:11 +0700
Subject: [PATCH 04/34] cmake-bootstrap: update to 3.19.4.

---
 srcpkgs/cmake-bootstrap/template | 4 ++--
 srcpkgs/cmake-bootstrap/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index fca0464975c..539033d6ffa 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-bootstrap'
 pkgname=cmake-bootstrap
-version=3.19.2
+version=3.19.4
 revision=1
 wrksrc=cmake-$version
 bootstrap=yes
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
+checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
 conflicts="cmake>=0"
 
 CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
diff --git a/srcpkgs/cmake-bootstrap/update b/srcpkgs/cmake-bootstrap/update
index 4671bfbb185..92f85b5350b 100644
--- a/srcpkgs/cmake-bootstrap/update
+++ b/srcpkgs/cmake-bootstrap/update
@@ -1 +1,2 @@
 site='https://cmake.org/download/'
+pkgname=cmake

From d00865d80410d2bd2fcaf2fead236fda06f5fb06 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: Sun, 31 Jan 2021 09:19:37 +0700
Subject: [PATCH 05/34] cmake: update to 3.19.4.

---
 .../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 <ndowens@artixlinux.org>
-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 <ndowens04@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=3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732
+checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
+
+export CMAKE_GENERATOR="Unix Makefiles"
 
 pre_check() {
 	# use ctest of this build instead of requirig cmake to test cmake...

From e59decd135d1b0dc7868c57b48a588d87582c788 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: Sun, 31 Jan 2021 09:43:17 +0700
Subject: [PATCH 06/34] cmake-gui: update to 3.19.4.

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

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index cac045092ba..369450ed3cd 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.19.2
+version=3.19.4
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
+checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
 
 do_install() {
 	# We are only interested in cmake-gui.

From 173697bf737014395748b210d670380a91b1a449 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:09:02 +0100
Subject: [PATCH 07/34] anope: use gnu-make

---
 srcpkgs/anope/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/anope/template b/srcpkgs/anope/template
index 42b05622161..56b3d16d304 100644
--- a/srcpkgs/anope/template
+++ b/srcpkgs/anope/template
@@ -4,6 +4,7 @@ version=2.0.7
 revision=2
 wrksrc="${pkgname}-${version}-source"
 build_style=cmake
+make_cmd=make
 configure_args="-DINSTDIR=../install -DRUNGROUP=_anope -DDEFUMASK=077
  -DUSE_PCH=OFF"
 hostmakedepends="gettext"
@@ -25,6 +26,8 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	LDFLAGS="-lintl"
 fi
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 pre_configure() {
 	# prevent cmake from building include/version and running
 	# because it breaks cross compiling (cmake can't differentiate

From ef701b35fbfccdabf0522e242d830c7397c991b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:33:25 +0100
Subject: [PATCH 08/34] enyo-doom: fix ninja build

---
 srcpkgs/enyo-doom/patches/cmake.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/enyo-doom/patches/cmake.patch

diff --git a/srcpkgs/enyo-doom/patches/cmake.patch b/srcpkgs/enyo-doom/patches/cmake.patch
new file mode 100644
index 00000000000..8c9d9f4c664
--- /dev/null
+++ b/srcpkgs/enyo-doom/patches/cmake.patch
@@ -0,0 +1,13 @@
+--- CMakeLists.txt	2020-09-20 23:03:04.000000000 +0200
++++ -	2021-02-08 16:29:03.621982747 +0100
+@@ -22,8 +22,8 @@
+ include_directories ( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+ find_package ( Qt5Core REQUIRED )
+ find_package (Qt5Widgets REQUIRED )
+-add_definitions ( $(Qt5Core_DEFINITIONS) )
+-add_definitions ( $(Qt5Widgets_DEFINITIONS) )
++add_definitions ( ${Qt5Core_DEFINITIONS} )
++add_definitions ( ${Qt5Widgets_DEFINITIONS} )
+ qt5_wrap_ui ( UI_HEADERS ${ENYO_DOOM_UIS} )
+ qt5_wrap_cpp ( MOC_SOURCES ${ENYO_DOOM_HDRS} )
+ qt5_add_resources ( RC_SOURCES ${ENYO_DOOM_RCS} )

From dbae6391a81a16d8b7956c7b892cfdbb0d4f23a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:38:12 +0100
Subject: [PATCH 09/34] include-what-you-use: remove VERBOSE=1 make_build_args

---
 srcpkgs/include-what-you-use/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 4457485233c..ef508ff0b97 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -5,7 +5,6 @@ revision=1
 create_wrksrc="yes"
 build_style=cmake
 configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
-make_build_args="VERBOSE=1"
 makedepends="clang clang-tools-extra llvm ncurses-devel zlib-devel"
 short_desc="Analyze #includes in C and C++ source files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d887ab90512a3b730334aa6bd4a3f162718b4fdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:57:15 +0100
Subject: [PATCH 10/34] devilutionX: fix build with ninja

---
 ...6fe89ea1977aa296277694a6e94314aca0a8.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch

diff --git a/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch b/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch
new file mode 100644
index 00000000000..9dfe2413e72
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch
@@ -0,0 +1,30 @@
+From 201c6fe89ea1977aa296277694a6e94314aca0a8 Mon Sep 17 00:00:00 2001
+From: Alex Sweet <sweet.giorni@gmail.com>
+Date: Mon, 23 Mar 2020 01:59:33 -0700
+Subject: [PATCH] Fix ninja-build build error
+
+---
+ CMakeLists.txt | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a8f0c4492..89051b7bc 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -502,8 +502,14 @@ endif()
+ 
+ if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+   # Change __FILE__ to only show the path relative to the project folder
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'")
++  get_target_property(devilution_SRCS devilution SOURCES)
++  foreach(SOURCE_FILE ${devilution_SRCS} ${devilutionx_SRCS})
++    set_source_files_properties(${SOURCE_FILE} PROPERTIES
++      COMPILE_DEFINITIONS __FILE__="${SOURCE_FILE}"
++    )
++  endforeach(SOURCE_FILE)
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined")
+ 
+   if(DEBUG)
+     # Note: For Valgrind suppor.

From ce441ad6f6a0e9333e5a16efd35b0b107e0197a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:58:06 +0100
Subject: [PATCH 11/34] llvm-libunwind: remove VERBOSE=1 make_build_args

---
 srcpkgs/llvm-libunwind/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/llvm-libunwind/template b/srcpkgs/llvm-libunwind/template
index 62d88f61b4e..b9ad1c97693 100644
--- a/srcpkgs/llvm-libunwind/template
+++ b/srcpkgs/llvm-libunwind/template
@@ -6,7 +6,6 @@ build_style=cmake
 wrksrc="libunwind-${version}.src"
 hostmakedepends="llvm11"
 makedepends="llvm11"
-make_build_args="VERBOSE=1"
 short_desc="LLVM version of libunwind library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA, MIT"

From 4adf7d6a03b987e35a306470b9414ac941486efb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:05:00 +0100
Subject: [PATCH 12/34] libogdf: remove noop make_build_args

---
 srcpkgs/libogdf/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libogdf/template b/srcpkgs/libogdf/template
index 4cb794f0ea7..d9bcdd886a0 100644
--- a/srcpkgs/libogdf/template
+++ b/srcpkgs/libogdf/template
@@ -6,7 +6,6 @@ archs="i686* x86_64*"
 wrksrc=OGDF-snapshot
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DOGDF_EXTRA_CXX_FLAGS=-Wno-error"
-make_build_args="-Wno-error=class-memaccess"
 hostmakedepends="unzip python"
 makedepends="libClp-devel"
 short_desc="Open Graph Drawing Framework"

From 8c4f3206ba0d21d38f2fc4b41774ce7a34d9135a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:11:57 +0100
Subject: [PATCH 13/34] musikcube: use make explicitly

---
 srcpkgs/musikcube/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index a3da40c134b..c5d5cb0b40c 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -3,6 +3,7 @@ pkgname=musikcube
 version=0.93.1
 revision=2
 build_style=cmake
+make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
@@ -21,6 +22,8 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
 fi
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 #XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs
 # SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
 makedepends+=" libglvnd"

From 63b185b978dfc704e06d1f4e9a15ffc2d0d23b45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:16:18 +0100
Subject: [PATCH 14/34] supercollider: use make explicitly

---
 srcpkgs/supercollider/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index b83b62db95d..bded2fc4908 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -4,6 +4,7 @@ version=3.11.1
 revision=1
 wrksrc="SuperCollider-${version}-Source"
 build_style=cmake
+make_cmd=make
 configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"
 hostmakedepends="emacs pkg-config"
 makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libatomic-devel
@@ -22,6 +23,8 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
 fi
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
 

From 99471c8b608fef56cfbf76e57b30da3bd406b5e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:18:38 +0100
Subject: [PATCH 15/34] sysdig: use make explicitly

---
 srcpkgs/sysdig/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 1a6e38a3d73..fa7fafc80d2 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -7,6 +7,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
  -DLUA_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/luajit-2.1
  -DLUA_LIBRARY=libluajit-5.1.so -DCREATE_TEST_TARGETS=OFF"
+make_cmd=make
 hostmakedepends="wget pkg-config protobuf"
 makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
  libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
@@ -27,6 +28,8 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" -DMUSL_OPTIMIZED_BUILD=On"
 esac
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 # Avoid excessive warnings spam to the log
 CXXFLAGS="-Wno-deprecated-declarations"
 

From 3251341eeb7cc991c9f40e51d6c9fbeda248a4fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:19:41 +0100
Subject: [PATCH 16/34] opencolorio: use make explicitly

---
 srcpkgs/opencolorio/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index f83d3e25491..17973659858 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -9,6 +9,7 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
+make_cmd=make
 hostmakedepends="pkg-config git"
 makedepends="tinyxml-devel lcms2-devel"
 short_desc="A complete color management solution"
@@ -19,6 +20,8 @@ changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/Chang
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
 checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_install() {
 	vlicense LICENSE
 }

From 9733f6fca720c41b73216db579bd37a3d0b58bc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:20:40 +0100
Subject: [PATCH 17/34] opentoonz: use make explicitly

---
 srcpkgs/opentoonz/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index cb6fed95dd7..503ebf2d789 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -4,6 +4,7 @@ version=1.4.0
 revision=1
 build_wrksrc="toonz/sources"
 build_style=cmake
+make_cmd=make
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
 makedepends="qt5-devel qt5-svg-devel qt5-script-devel qt5-tools-devel qt5-multimedia-devel
  superlu-devel glew-devel libjpeg-turbo-devel liblzma-devel liblz4-devel lzo-devel
@@ -16,6 +17,8 @@ homepage="https://opentoonz.github.io/e/"
 distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
 checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 pre_configure() {
 	# Upstream uses their own modified version of tiff
 	if [ "$CROSS_BUILD" ]; then

From bae47deaed96b1d129f5f29aa9d85f3231c6c43b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:21:45 +0100
Subject: [PATCH 18/34] libclc: build with ninja

---
 srcpkgs/libclc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
index 590a33736f1..a1ff860eacd 100644
--- a/srcpkgs/libclc/template
+++ b/srcpkgs/libclc/template
@@ -21,7 +21,7 @@ do_configure() {
 	unset CC CXX LD CFLAGS CXXFLAGS LDFLAGS
 	mkdir -p build
 	cd build
-	cmake ${configure_args} ..
+	cmake -GNinja ${configure_args} ..
 }
 
 post_install() {

From 614e3ee85ff2c060d38cbc818dd2d83c02d84e38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:32:10 +0100
Subject: [PATCH 19/34] fntsample: use make explicitly

---
 srcpkgs/fntsample/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/fntsample/template b/srcpkgs/fntsample/template
index 7abc88b2aa9..500c58ff552 100644
--- a/srcpkgs/fntsample/template
+++ b/srcpkgs/fntsample/template
@@ -5,6 +5,7 @@ revision=1
 build_style=cmake
 wrksrc="fntsample-release-${version}"
 configure_args="-DUNICODE_BLOCKS=../Blocks.txt"
+make_cmd=make
 hostmakedepends="gettext pkg-config"
 makedepends="cairo-devel fontconfig-devel freetype-devel glib-devel pango-devel"
 short_desc="PDF and PostScript font samples generator"
@@ -21,6 +22,8 @@ checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b
 skip_extraction="Blocks.txt
  terms_of_use.html"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_extract() {
 	cp "${XBPS_SRCDISTDIR}/fntsample-${version}/Blocks.txt" "${wrksrc}/"
 }

From 90fc0e1ab0bd9772876b210d4da82cbb17941844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:33:48 +0100
Subject: [PATCH 20/34] bullet: use make explicitly

---
 srcpkgs/bullet/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/bullet/template b/srcpkgs/bullet/template
index 95772dbc509..436a12532ce 100644
--- a/srcpkgs/bullet/template
+++ b/srcpkgs/bullet/template
@@ -6,6 +6,7 @@ wrksrc="bullet3-${version}"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_BULLET2_DEMOS=0 -DBUILD_CPU_DEMOS=0
  -DBUILD_UNIT_TESTS=0 -DBUILD_OPENGL3_DEMOS=0 -DBUILD_EXTRAS=1 -DINSTALL_EXTRA_LIBS=1"
+make_cmd=make
 makedepends="glu-devel"
 short_desc="3D Collision Detection and Rigid Body Dynamics Library"
 maintainer="John <me@johnnynator.dev>"
@@ -14,6 +15,8 @@ homepage="http://www.bulletphysics.com/Bullet/"
 distfiles="https://github.com/bulletphysics/bullet3/archive/${version}.tar.gz"
 checksum=621b36e91c0371933f3c2156db22c083383164881d2a6b84636759dc4cbb0bb8
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_install() {
 	vlicense LICENSE.txt
 }

From 417eab4476c1b11c1fc8d99fe0311c7b193272eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:34:58 +0100
Subject: [PATCH 21/34] warsow: use make explicitly

---
 srcpkgs/warsow/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/warsow/template b/srcpkgs/warsow/template
index dfd8d8d75ba..8dad5adb742 100644
--- a/srcpkgs/warsow/template
+++ b/srcpkgs/warsow/template
@@ -6,6 +6,7 @@ wrksrc="warsow_${version/./}_sdk"
 build_wrksrc="source/source"
 build_style=cmake
 configure_args="-DQFUSION_GAME=Warsow"
+make_cmd=make
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libvorbis-devel libtheora-devel libjpeg-turbo-devel
  libopenal-devel MesaLib-devel libXi-devel libXxf86dga-devel
@@ -21,6 +22,8 @@ checksum=99c88bc08f5e6055d28534de6e84fc204026dda51dc31e22caca1977f199453a
 
 archs="i686* x86_64*"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 CFLAGS="-fcommon"
 
 do_install() {

From 70c7f815f7ef554163ed71571b2470e2a01651fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:36:11 +0100
Subject: [PATCH 22/34] stepmania: use make explicitly

---
 srcpkgs/stepmania/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/stepmania/template b/srcpkgs/stepmania/template
index 9ec2c4c2421..4baeccb828d 100644
--- a/srcpkgs/stepmania/template
+++ b/srcpkgs/stepmania/template
@@ -3,6 +3,7 @@ pkgname=stepmania
 version=5.0.12
 revision=2
 build_style=cmake
+make_cmd=make
 cmake_builddir="Build"
 hostmakedepends="nasm yasm pkg-config git"
 makedepends="libmad-devel libvorbis-devel pcre-devel libjpeg-turbo-devel
@@ -19,6 +20,8 @@ checksum=df79bcadd69d4ed60cf560d45386ec275181343495ffd744c3ff8f73c83d4755
 # with Windows
 archs="i686 x86_64"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_install() {
 	vlicense Docs/Licenses.txt
 

From b4a8a95ed0b6cebdd23960492fa423e4224d0500 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:38:14 +0100
Subject: [PATCH 23/34] ippusbxd: use make explicitly

---
 srcpkgs/ippusbxd/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/ippusbxd/template b/srcpkgs/ippusbxd/template
index b8036c30e82..ce4ff2ea912 100644
--- a/srcpkgs/ippusbxd/template
+++ b/srcpkgs/ippusbxd/template
@@ -4,6 +4,7 @@ version=1.34
 revision=1
 build_wrksrc=src
 build_style=cmake
+make_cmd=make
 hostmakedepends="pkg-config"
 makedepends="libusb-devel avahi-libs-devel libxml2-devel cups-devel"
 short_desc="Internet Printing Protocol (IPP) over USB driver"
@@ -14,6 +15,8 @@ distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=996a572c8f6d1426a58ad3b95c21fea7f5b64d5db34a825c543d7869b3c77891
 conf_files="/etc/apparmor.d/usr.sbin.ippusbxd"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 do_install() {
 	vbin build/ippusbxd
 	vman ../doc/ippusbxd.8

From bc941b2177b357b3ed1ea7120925ce3b4576cf6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:39:11 +0100
Subject: [PATCH 24/34] Cataclysm-DDA: use make explicitly

---
 srcpkgs/Cataclysm-DDA/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/Cataclysm-DDA/template b/srcpkgs/Cataclysm-DDA/template
index 7cc73c18306..bbe66b9f29b 100644
--- a/srcpkgs/Cataclysm-DDA/template
+++ b/srcpkgs/Cataclysm-DDA/template
@@ -4,6 +4,7 @@ version=0.E
 revision=4
 build_style=cmake
 configure_args="-DRELEASE=1 $(vopt_bool backtrace BACKTRACE) -DUSE_HOME_DIR=1 -DPREFIX=/usr"
+make_cmd=make
 hostmakedepends="gettext pkg-config"
 makedepends="$(vopt_if tiles 'SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel freetype-devel')
  ncurses-devel"
@@ -18,6 +19,8 @@ checksum=b0af9a9292929e17332edcea770bca9a91f1d08ea47726d78a47e09281a42fa3
 build_options="tiles backtrace"
 build_options_default="tiles"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 case $XBPS_TARGET_MACHINE in
 	*-musl);;
 	*) build_options_default+=" backtrace";;

From d9b1d0a8bac1c91507e667d9957bf6daa42c2347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 18:13:19 +0100
Subject: [PATCH 25/34] arcan: use make explicitly

---
 srcpkgs/arcan/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 60db46d2acd..7788f50d332 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -4,6 +4,7 @@ version=0.6.0.1
 revision=1
 build_wrksrc=src
 build_style=cmake
+make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
@@ -27,6 +28,8 @@ checksum="7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
  3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da"
 patch_args="-Np1"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 replaces="arcan-wayland>=0"
 
 build_options="luajit tesseract tts wayland"

From c52a2f2cf80eea90a48d37d41c5f13f181e1c07b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 18:32:17 +0100
Subject: [PATCH 26/34] zig: use make explicitly

---
 srcpkgs/zig/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index e9fda2f3cde..5345f01c4ef 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -4,6 +4,7 @@ version=0.7.1
 revision=1
 archs="x86_64* aarch64*"
 build_style=cmake
+make_cmd=make
 makedepends="clang llvm11 lld-devel"
 short_desc="Programming language designed for robustness, optimality, and clarity"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -14,6 +15,8 @@ checksum=2db3b944ab368d955b48743d9f7c963b8f96de1a441ba5a35e197237cc6dae44
 nopie=yes
 nocross=yes
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_install() {
 	vlicense LICENSE
 }

From bbdf47f3800fb28f8439273fc5b51df7c1701dd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 18:34:05 +0100
Subject: [PATCH 27/34] z80ex: remove not needed sed calls

build/Makefile did never have a usr/local reference,
that one exists only in /Makefile, but that file isn't used

lib64 is now handled by xbps-src
---
 srcpkgs/z80ex/template | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/srcpkgs/z80ex/template b/srcpkgs/z80ex/template
index 8d74f415a21..00a24a6fb90 100644
--- a/srcpkgs/z80ex/template
+++ b/srcpkgs/z80ex/template
@@ -10,13 +10,6 @@ homepage="https://sourceforge.net/projects/z80ex/"
 distfiles="${SOURCEFORGE_SITE}/project/z80ex/z80ex/${version}/z80ex-${version}.tar.gz"
 checksum=6f5e521d068a614b41e10180ad4ae45b1bc258ec28c962543feb9078856c2530
 
-pre_configure() {
-	sed -i 's#lib64#lib#g' CMakeLists.txt
-}
-pre_build() {
-	sed -i 's#/usr/local#/usr#g' build/Makefile
-}
-
 z80ex-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From bfd09898bdbc674171c58711a67c57f943a15811 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 19:41:06 +0100
Subject: [PATCH 28/34] libcxxabi: remove VERBOSE=1 make_build_args

---
 srcpkgs/libcxxabi/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libcxxabi/template b/srcpkgs/libcxxabi/template
index 3b19b4de8af..2f024625fa3 100644
--- a/srcpkgs/libcxxabi/template
+++ b/srcpkgs/libcxxabi/template
@@ -7,7 +7,6 @@ build_style=cmake
 configure_args="-DLIBCXXABI_LIBCXX_INCLUDES=../../libcxx/include
  -DLIBCXXABI_USE_LLVM_UNWINDER=1
  -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
-make_build_args="VERBOSE=1"
 hostmakedepends="clang-tools-extra llvm11"
 makedepends="llvm11 llvm-libunwind-devel"
 short_desc="Low-level support for libc++ standard library"

From b201eeeefe7afc04219e35313524ce52cedc0ad8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 22:39:33 +0100
Subject: [PATCH 29/34] supertux2: use make explicitly

---
 srcpkgs/supertux2/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 6546d1b0aa0..4c39b458dad 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -9,6 +9,7 @@ configure_args="
  -DINSTALL_SUBDIR_BIN=bin
  -DINSTALL_SUBDIR_SHARE=share/supertux2
  -DWERROR=OFF"
+make_cmd=make
 hostmakedepends="pkg-config"
 makedepends="SDL2_image-devel boost-devel glew-devel libcurl-devel
  libopenal-devel libraqm-devel physfs-devel"
@@ -19,3 +20,5 @@ homepage="https://supertux.github.io/"
 distfiles="https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"
 checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
 replaces="supertux2-data>=0"
+
+export CMAKE_GENERATOR="Unix Makefiles"

From 53b7004f3584308a230da484a57c83aee14bb29a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 22:45:57 +0100
Subject: [PATCH 30/34] nheko: remove build job restriction

I could not reproduce any significant memory load
that would justify a restriction to 8 jobs
---
 srcpkgs/nheko/template | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 198407862a4..541d113a16e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -16,12 +16,3 @@ homepage="https://github.com/Nheko-Reborn/nheko"
 changelog="https://github.com/Nheko-Reborn/nheko/blob/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
 checksum=412908fcec0e66a0557db5359556b65e85dd22b8644a6a2ed569a90dea4bde3c
-
-# this one is very memory hungry and can use as much as 3GB per cc1plus
-# realistically, using any more than 8 jobs will easily lead to OOM
-do_build() {
-	cd build
-	local njobs=${XBPS_MAKEJOBS}
-	[ "$njobs" -gt 8 ] && njobs=8
-	make -j${njobs}
-}

From 369208daf8cbb5f8a4e92502b845d61752dc5688 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 22:59:33 +0100
Subject: [PATCH 31/34] gnuradio-nrsc5: use make explicitly

---
 srcpkgs/gnuradio-nrsc5/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 56f984f7bd3..6299e7c90b0 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -4,6 +4,7 @@ version=1.0.0
 revision=4
 wrksrc="gr-nrsc5-${version}"
 build_style=cmake
+make_cmd=make
 hostmakedepends="git automake libtool pkg-config gnuradio swig"
 makedepends="gnuradio-devel boost-devel libcppunit-devel python3-devel
  log4cpp-devel gmpxx-devel mpir-devel gsl-devel volk-devel"
@@ -14,6 +15,8 @@ homepage="https://github.com/argilo/gr-nrsc5/"
 distfiles="https://github.com/argilo/gr-nrsc5/archive/v${version}.tar.gz"
 checksum=d736c4cb1104254d07296d2a61880e07149c9bfd1a49aed504215672d4e09485
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -i CMakeLists.txt \

From c21c0ee91e67825d8a31f1f3f3ab0b135a70ef75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 23:00:28 +0100
Subject: [PATCH 32/34] libcxx: remove VERBOSE=1 make_build_args

---
 srcpkgs/libcxx/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template
index 87c400883a1..4e579963679 100644
--- a/srcpkgs/libcxx/template
+++ b/srcpkgs/libcxx/template
@@ -9,7 +9,6 @@ configure_args+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=
  -DLIBCXXABI_USE_LLVM_UNWINDER=1"
 hostmakedepends="llvm11 clang-tools-extra python3"
 makedepends="libcxxabi-devel llvm11 llvm-libunwind-devel"
-make_build_args="VERBOSE=1"
 short_desc="New implementation of the C++ standard library, targeting C++11, C++14 and above"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA, MIT"

From f842849fc8c70f5105507532b7dbc9c98b33c722 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 23:28:13 +0100
Subject: [PATCH 33/34] ktouch: remove not needed sed lines

---
 srcpkgs/ktouch/template | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/srcpkgs/ktouch/template b/srcpkgs/ktouch/template
index f6b17229723..ac95212e3c6 100644
--- a/srcpkgs/ktouch/template
+++ b/srcpkgs/ktouch/template
@@ -16,12 +16,3 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/education/org.kde.ktouch"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktouch-${version}.tar.xz"
 checksum=76c80e85dcd30704341a5ed997915321a5daf2fc32f38ed2c2db59f84afd7d48
-
-post_configure() {
-	sed -e 's|/usr/bin/qmlcachegen|/usr/bin/qmlcachegen-qt5|g' \
-		-i build/src/CMakeFiles/ktouch.dir/build.make
-
-	# Fix path for qmlcachegen on cross builds
-	sed -e "s|${XBPS_CROSS_BASE}/usr/bin/qmlcachegen-qt5|/usr/bin/qmlcachegen-qt5|g" \
-		-i build/src/CMakeFiles/ktouch.dir/build.make
-}

From 2aafceaea892ec5f31bdd685bdffd6e01114f07b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 23:59:57 +0100
Subject: [PATCH 34/34] calligra: use make explicitly

---
 srcpkgs/calligra/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index abed8c2f348..6d9a441ab17 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -5,6 +5,7 @@ revision=2
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"
+make_cmd=make
 hostmakedepends="perl pkg-config extra-cmake-modules gettext"
 makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
  exiv2-devel kactivities5-devel gsl-devel qt5-declarative-devel
@@ -30,6 +31,8 @@ replaces="calligra-braindump>=0 calligra-flow>=0"
 build_options="webengine"
 desc_option_webengine="Use Qt5 WebEngine for Calligra Gemini"
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	# webengine does not cross-build from 64bit to 32bit, use webkit
 	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then

Re: [PR PATCH] [Closed]: [WiP] build-style/cmake: use ninja as default generator

[Johnnynator]

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

There's a closed pull request on the void-packages repository

[WiP] build-style/cmake: use ninja as default generator
https://github.com/void-linux/void-packages/pull/28304

Description:
<!-- Mark items with [x] where applicable -->

There are probably packages broken with it.

#### 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
-->