From: JamiKettunen <JamiKettunen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] common: unset CMAKE_GENERATOR before sourcing templates
Date: Sun, 05 Jun 2022 17:08:01 +0200 [thread overview]
Message-ID: <20220605150801.QvGLKmmzMqaADz7lkIBotP7SjNsaCImh0iCTs8Q3wFs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37413@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1675 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages unset-CMAKE_GENERATOR
https://github.com/void-linux/void-packages/pull/37413
common: unset CMAKE_GENERATOR before sourcing templates
When building dependencies of packages this has to be unset to avoid using e.g. `CMAKE_GENERATOR="Unix Makefiles"` for a package which expected to build with the default of `make_cmd=ninja`, and would subsequently fail with `ninja: error: loading 'build.ninja': No such file or directory` during `do_build()` if `do_configure()` generated a Makefile instead of a
build.ninja file.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/37413.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-unset-CMAKE_GENERATOR-37413.patch --]
[-- Type: text/x-diff, Size: 1325 bytes --]
From 6297eeaa46bdfe60992c81ff7a7acf1e50c2d3f1 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 5 Jun 2022 02:48:41 +0300
Subject: [PATCH] common: unset CMAKE_GENERATOR before sourcing templates
When building dependencies of packages this has to be unset to avoid
using e.g. CMAKE_GENERATOR="Unix Makefiles" for a package which expected
to build with the default of make_cmd=ninja, and would subsequently fail
with "ninja: error: loading 'build.ninja': No such file or directory"
during do_build() if do_configure() generated a Makefile instead of a
build.ninja file.
---
common/environment/setup/sourcepkg.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh
index e0e16d7915cb..3a9bcdacb872 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -18,6 +18,7 @@ unset -v reverts subpackages makedepends hostmakedepends checkdepends depends re
unset -v nopie build_options build_options_default bootstrap repository reverts
unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH
unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF PKG_CONFIG
+unset -v CMAKE_GENERATOR
# hooks/do-extract/00-distfiles
unset -v skip_extraction
next prev parent reply other threads:[~2022-06-05 15:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-04 23:56 [PR PATCH] " JamiKettunen
2022-06-05 15:04 ` [PR REVIEW] " ericonr
2022-06-05 15:08 ` JamiKettunen [this message]
2022-06-05 15:08 ` JamiKettunen
2022-06-05 15:09 ` JamiKettunen
2022-06-05 20:22 ` ericonr
2022-06-05 20:23 ` [PR PATCH] [Merged]: " ericonr
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=20220605150801.QvGLKmmzMqaADz7lkIBotP7SjNsaCImh0iCTs8Q3wFs@z \
--to=jamikettunen@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).