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

programs: Store the project version when overriding find_program #13714

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

nirbheek
Copy link
Member

When we're using the output of configure_file() with override_find_program(), we weren't storing the version anywhere, so get_version() was trying to run the script during setup.

This is usually fine, except in cases where the configure_file() script actually has to import a library built as part of the project, and fails to run.

For built executables, we simply use the project version, and we now do the same here too.

@nirbheek nirbheek added this to the 1.5.2 milestone Sep 26, 2024
@nirbheek nirbheek force-pushed the File-program-version branch 2 times, most recently from abdba2b to aa0efb9 Compare September 26, 2024 09:52
@eli-schwartz eli-schwartz modified the milestones: 1.5.2, 1.5.3 Sep 27, 2024
mesonbuild/programs.py Outdated Show resolved Hide resolved
@nirbheek
Copy link
Member Author

Will merge in 24h if there are no objections.

When we're using the output of configure_file() with
override_find_program(), we weren't storing the version anywhere, so
get_version() was trying to run the script during setup.

This is usually fine, except in cases where the configure_file()
script actually has to import a library built as part of the project,
and fails to run.

For built executables, we simply use the project version, and we
now do the same here too.
@dcbaker dcbaker merged commit fb4995a into mesonbuild:master Sep 30, 2024
31 of 33 checks passed
@nirbheek nirbheek deleted the File-program-version branch October 3, 2024 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants