From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] build-style/cmake: do not require ninja if make is desired
Date: Wed, 17 Mar 2021 02:18:31 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29521@inbox.vuxu.org> (raw)
[-- 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
next reply other threads:[~2021-03-17 1:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 1:18 sgn [this message]
2021-03-17 20:27 ` Chocimier
2021-03-18 11:24 ` [PR PATCH] [Updated] " sgn
2021-03-24 23:58 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29521@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).