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

Mocklibc subproject fixes #436

Merged
merged 2 commits into from
Mar 19, 2024
Merged

Conversation

mbiebl
Copy link
Contributor

@mbiebl mbiebl commented Mar 16, 2024

Turn local modifications of mocklibc into patches and apply them via diff_files

The local copy of mocklibc was changed in
63ee649
5b8cd1a
0d78d1e

Turn those into patches and apply them via the diff_files mechanism.
This requires Meson 0.63.0, so bump the version accordingly.

https://mesonbuild.com/Wrap-dependency-system-manual.html#diff-files

Follow-up/Fix for #428

Since the port to Meson, mocklibc is pulled in as a Meson subproject.
As the local copy is now unused, it is best to remove it.
@mbiebl
Copy link
Contributor Author

mbiebl commented Mar 16, 2024

Will fix #182

…diff_files

The local copy of mocklibc was changed in
63ee649
5b8cd1a
0d78d1e

Turn those into patches and apply them via the diff_files mechanism.
This requires Meson 0.63.0, so bump the version accordingly.

https://mesonbuild.com/Wrap-dependency-system-manual.html#diff-files
@jrybar-rh jrybar-rh merged commit 60673b8 into polkit-org:main Mar 19, 2024
12 of 13 checks passed
@mbiebl
Copy link
Contributor Author

mbiebl commented Mar 19, 2024

@jrybar-rh this will raise the minimum required meson version to 0.63.0.
Unfortunately, Ubuntu Jammy i.e. 22.10, only has meson 0.61.2.
Should the CI be updated to use something newer, like 23.04 or 23.10?

/me is looking at https://github.com/polkit-org/polkit/actions/runs/8310088174/job/22742181725

@mbiebl
Copy link
Contributor Author

mbiebl commented Mar 19, 2024

Another alternative could be, to create a PPA with a meson backport or use one of the existing ones at
https://launchpad.net/ubuntu/+ppas?name_filter=meson

@mbiebl
Copy link
Contributor Author

mbiebl commented Mar 19, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants