* [PR PATCH] common: unset CMAKE_GENERATOR before sourcing templates
@ 2022-06-04 23:56 JamiKettunen
2022-06-05 15:04 ` [PR REVIEW] " ericonr
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: JamiKettunen @ 2022-06-04 23:56 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] common: unset CMAKE_GENERATOR before sourcing templates
2022-06-04 23:56 [PR PATCH] common: unset CMAKE_GENERATOR before sourcing templates JamiKettunen
@ 2022-06-05 15:04 ` ericonr
2022-06-05 15:08 ` [PR PATCH] [Updated] " JamiKettunen
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2022-06-05 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/37413#discussion_r889702288
Comment:
Put this under the `CC` block, as it's also an env var we export to children processes instead of only used by xbps-src.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] common: unset CMAKE_GENERATOR before sourcing templates
2022-06-04 23:56 [PR PATCH] common: unset CMAKE_GENERATOR before sourcing templates JamiKettunen
2022-06-05 15:04 ` [PR REVIEW] " ericonr
@ 2022-06-05 15:08 ` JamiKettunen
2022-06-05 15:08 ` [PR REVIEW] " JamiKettunen
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: JamiKettunen @ 2022-06-05 15:08 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] common: unset CMAKE_GENERATOR before sourcing templates
2022-06-04 23:56 [PR PATCH] common: unset CMAKE_GENERATOR before sourcing templates JamiKettunen
2022-06-05 15:04 ` [PR REVIEW] " ericonr
2022-06-05 15:08 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-06-05 15:08 ` JamiKettunen
2022-06-05 15:09 ` JamiKettunen
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: JamiKettunen @ 2022-06-05 15:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New review comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/37413#discussion_r889702670
Comment:
Hope I understood this correctly :)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] common: unset CMAKE_GENERATOR before sourcing templates
2022-06-04 23:56 [PR PATCH] common: unset CMAKE_GENERATOR before sourcing templates JamiKettunen
` (2 preceding siblings ...)
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
5 siblings, 0 replies; 7+ messages in thread
From: JamiKettunen @ 2022-06-05 15:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New review comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/37413#discussion_r889702670
Comment:
Hope I understood this correctly (and you didn't mean add it as an extension to the `unset CC ...` line) :)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] common: unset CMAKE_GENERATOR before sourcing templates
2022-06-04 23:56 [PR PATCH] common: unset CMAKE_GENERATOR before sourcing templates JamiKettunen
` (3 preceding siblings ...)
2022-06-05 15:09 ` JamiKettunen
@ 2022-06-05 20:22 ` ericonr
2022-06-05 20:23 ` [PR PATCH] [Merged]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2022-06-05 20:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/37413#discussion_r889733063
Comment:
You did :)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: common: unset CMAKE_GENERATOR before sourcing templates
2022-06-04 23:56 [PR PATCH] common: unset CMAKE_GENERATOR before sourcing templates JamiKettunen
` (4 preceding siblings ...)
2022-06-05 20:22 ` ericonr
@ 2022-06-05 20:23 ` ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2022-06-05 20:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]
There's a merged pull request on the void-packages repository
common: unset CMAKE_GENERATOR before sourcing templates
https://github.com/void-linux/void-packages/pull/37413
Description:
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
-->
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-06-05 20:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-04 23:56 [PR PATCH] common: unset CMAKE_GENERATOR before sourcing templates JamiKettunen
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
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).