[PR PATCH] build-style/cmake: do not require ninja if make is desired

[PR PATCH] build-style/cmake: do not require ninja if make is desired

[sgn]

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

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

https://github.com/sgn/void-packages cmake-build-style-optional-ninja
https://github.com/void-linux/void-packages/pull/29521

build-style/cmake: do not require ninja if make is desired
<!-- 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/29521.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-build-style-optional-ninja-29521.patch --]
[-- Type: text/x-diff, Size: 857 bytes --]

From 79f39f19415c141cb86ad993c59d76afa8044db8 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: Wed, 17 Mar 2021 08:11:31 +0700
Subject: [PATCH] build-style/cmake: do not require ninja if make is desired

---
 common/environment/build-style/cmake.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index c9e4d8961598..54f51ccd1ef0 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,5 +1,8 @@
 if [ "$CHROOT_READY" ]; then
 	if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
-		hostmakedepends+=" cmake ninja"
+		hostmakedepends+=" cmake"
+	fi
+	if [[ "$make_cmd" != make ]]; then
+		hostmakedepends+=" ninja"
 	fi
 fi

Re: build-style/cmake: do not require ninja if make is desired

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/29521#issuecomment-801420522

Comment:
Good, but maybe that way?

    case "$make_cmd" in
    	ninja|'') hostmakedepends+=" ninja"
    esac

Re: [PR PATCH] [Updated] build-style/cmake: do not require ninja if make is desired

[sgn]

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

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

https://github.com/sgn/void-packages cmake-build-style-optional-ninja
https://github.com/void-linux/void-packages/pull/29521

build-style/cmake: do not require ninja if make is desired
<!-- 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/29521.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-build-style-optional-ninja-29521.patch --]
[-- Type: text/x-diff, Size: 865 bytes --]

From 60984d4a640f6213b52840e299b708be30e133fb 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: Wed, 17 Mar 2021 08:11:31 +0700
Subject: [PATCH] build-style/cmake: do not require ninja if make_cmd is make

---
 common/environment/build-style/cmake.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index c9e4d8961598..4306b7b3882b 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,5 +1,8 @@
 if [ "$CHROOT_READY" ]; then
 	if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
-		hostmakedepends+=" cmake ninja"
+		hostmakedepends+=" cmake"
+	fi
+	if [ "${make_cmd:-ninja}" = ninja ]; then
+		hostmakedepends+=" ninja"
 	fi
 fi

Re: [PR PATCH] [Merged]: build-style/cmake: do not require ninja if make is desired

[sgn]

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

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

build-style/cmake: do not require ninja if make is desired
https://github.com/void-linux/void-packages/pull/29521

Description:
<!-- 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
-->