Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix regression in precomputing CMAKE_SIZEOF_VOID_P #11761

Merged
merged 1 commit into from
May 2, 2023

Conversation

MaxHearnden
Copy link
Contributor

fixes NixOS/nixpkgs#229358
restores the pre caching behavior (808d593)

@MaxHearnden MaxHearnden requested a review from mensinda as a code owner May 2, 2023 18:33
Copy link

@Scrumplex Scrumplex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the build issue with https://github.com/marzer/tomlplusplus.

@eli-schwartz
Copy link
Member

Thanks for working on this, please move the [0] indexing to the detect_voidp_size method though. :)

@MaxHearnden
Copy link
Contributor Author

done

@eli-schwartz eli-schwartz added compilers module:cmake Issues related to the cmake module, including cmake.subproject labels May 2, 2023
@eli-schwartz eli-schwartz added this to the 1.1.1 milestone May 2, 2023
@eli-schwartz
Copy link
Member

eli-schwartz commented May 2, 2023

A better commit message might be something like:

fix regression in precomputing CMAKE_SIZEOF_VOID_P

In commit 808d5934dd6c6a6c16f66e9dc51dae6e83e02cef, compiler.sizeof was
refactored to introduce caching, but cmake subprojects did not adapt to
that API change and ended up embedding the python repr of a tuple as a
cmake variable. 

In commit 808d593, compiler.sizeof was
refactored to introduce caching, but cmake subprojects did not adapt to
that API change and ended up embedding the python repr of a tuple as a
cmake variable.
@MaxHearnden MaxHearnden changed the title fix CMAKE_SIZEOF_VOID_P fix regression in precomputing CMAKE_SIZEOF_VOID_P May 2, 2023
MaxHearnden added a commit to MaxHearnden/nixpkgs that referenced this pull request May 2, 2023
@eli-schwartz eli-schwartz merged commit 7c78c2b into mesonbuild:master May 2, 2023
MaxHearnden added a commit to MaxHearnden/nixpkgs that referenced this pull request May 2, 2023
eli-schwartz added a commit to eli-schwartz/meson that referenced this pull request May 3, 2023
In mesonbuild#11761 it turned out that we failed to correctly handle all
compiler.sizeof API changes in an old commit, breaking use of the
module. And mypy could have caught this for us, except that the module
is neither typed nor checked in CI. Partially solve this by adding lots
of type annotations, greatly reducing the number of mypy errors in this
file from 35 down to 12.
fabaff pushed a commit to fabaff/nixpkgs that referenced this pull request May 8, 2023
fabaff pushed a commit to fabaff/nixpkgs that referenced this pull request May 8, 2023
fabaff pushed a commit to fabaff/nixpkgs that referenced this pull request May 8, 2023
fabaff pushed a commit to fabaff/nixpkgs that referenced this pull request May 8, 2023
colemickens pushed a commit to colemickens/nixpkgs that referenced this pull request May 12, 2023
colemickens pushed a commit to colemickens/nixpkgs that referenced this pull request May 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compilers module:cmake Issues related to the cmake module, including cmake.subproject
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: prismlauncher
3 participants