Github messages for voidlinux
 help / color / mirror / Atom feed
From: JamiKettunen <JamiKettunen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] common: unset CMAKE_GENERATOR before sourcing templates
Date: Sun, 05 Jun 2022 01:56:54 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37413@inbox.vuxu.org> (raw)

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

There is a new 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: 1312 bytes --]

From 6d25aff0eeb828898a38037ecd64fd5a74e3bdbd 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..e1bbce7491c5 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -8,6 +8,7 @@ unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc
 unset -v make_build_args make_check_args make_install_args
 unset -v make_build_target make_check_target make_install_target
 unset -v make_cmd meson_cmd gem_cmd fetch_cmd make_check_pre
+unset -v CMAKE_GENERATOR
 unset -v python_version stackage
 unset -v cmake_builddir meson_builddir
 unset -v meson_crossfile

             reply	other threads:[~2022-06-04 23:56 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-04 23:56 JamiKettunen [this message]
2022-06-05 15:04 ` [PR REVIEW] " ericonr
2022-06-05 15:08 ` [PR PATCH] [Updated] " JamiKettunen
2022-06-05 15:08 ` [PR REVIEW] " 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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37413@inbox.vuxu.org \
    --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).