Fix CMake toolchain template env corruption and abseil build regression #15786
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
The cmake_value was incidentally available to CMakeToolchain, because Jinja maintains a pool of environments based on Template constructor arguments. It is forbidden to modify an environment fetched from such a shared pool. blocks.py would accidentally inject into toolchain.py's pool, which made the whole thing work since only toolchain.py uses the cmake_value filter.
This fixes cross-compilation of abseil, which would append lines and thus corrupt the last one. All text files should end in a new line, hence fixing this in Conan itself.
|
|
|
Please let me know if this needs a docs PR, I'm not sure about the process there. The docs repo doesn't seem to have any in-progress changes in develop, nor open PRs against the changelog. |
This was referenced Feb 29, 2024
|
Thanks very much for this contribution! Closing as superseded by #15788 |
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.
This pull request changes Conan 2's
CMakeToolchainto end in a new line by setting Jinja'skeep_final_newlineflag. This resolves #15785, where invalid CMake code was emitted.Setting the flag as-is in the original code would however entirely break the CMake toolchain generation due to a silent corruption of Jinja environments caused by a usage error. The original code would make
cmake_valueavailable from blocks.py to toolchain.py by corrupting Jinja shared environments. The whole thing worked incidentally! Any Jinja improvement to make Jinja more robust against this usage error would have broken Conan. This refactors the code to fix the silent corruption and properly inheritcmake_valuefrom toolchain.py into blocks.py.It also adds a test to ensure that this does not regress again in future versions.
Changelog:
CMakeToolchain.Docs: https://github.com/conan-io/docs/pull/XXXX
If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.developbranch, documenting this one.