common: unset CMAKE_GENERATOR before sourcing templates #37413
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ericonr
reviewed
Jun 5, 2022
| @@ -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 | |||
There was a problem hiding this 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.
There was a problem hiding this comment.
Hope I understood this correctly (and you didn't mean add it as an extension to the unset CC ... line) :)
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.
JamiKettunen
force-pushed
the
unset-CMAKE_GENERATOR
branch
from
6d25aff
to
6297eea
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 ofmake_cmd=ninja, and would subsequently fail withninja: error: loading 'build.ninja': No such file or directoryduringdo_build()ifdo_configure()generated a Makefile instead of abuild.ninja file.
Testing the changes