-
Notifications
You must be signed in to change notification settings - Fork 2.5k
meson: update to 1.9.1 #57635
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
Merged
Merged
meson: update to 1.9.1 #57635
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| # see https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/meson/skip-broken-tests.patch | ||
| # more specifically https://github.com/mesonbuild/meson/issues/8283 | ||
| # previously there was a vsed in the post_patch() of the template | ||
| --- a/mesonbuild/utils/universal.py | ||
| +++ b/mesonbuild/utils/universal.py | ||
| @@ -19,6 +19,7 @@ | ||
| from functools import lru_cache, wraps | ||
| from itertools import tee | ||
| from tempfile import TemporaryDirectory, NamedTemporaryFile | ||
| +from packaging.tags import sys_tags | ||
| import typing as T | ||
| import textwrap | ||
| import pickle | ||
| @@ -115,6 +116,7 @@ | ||
| 'is_aix', | ||
| 'is_android', | ||
| 'is_ascii_string', | ||
| + 'is_musl', | ||
| 'is_cygwin', | ||
| 'is_debianlike', | ||
| 'is_dragonflybsd', | ||
| @@ -650,6 +652,10 @@ | ||
| def is_wsl() -> bool: | ||
| return is_linux() and 'microsoft' in platform.release().lower() | ||
|
|
||
| +def is_musl() -> bool: | ||
| + tags = list(sys_tags() ) | ||
| + return "musl" in tags[0].platform | ||
| + | ||
| def is_cygwin() -> bool: | ||
| return sys.platform == 'cygwin' | ||
|
|
||
| --- a/unittests/linuxliketests.py | ||
| +++ b/unittests/linuxliketests.py | ||
| @@ -23,7 +23,7 @@ | ||
| import mesonbuild.coredata | ||
| import mesonbuild.modules.gnome | ||
| from mesonbuild.mesonlib import ( | ||
| - MachineChoice, is_windows, is_osx, is_cygwin, is_openbsd, is_haiku, | ||
| + MachineChoice, is_windows, is_osx, is_musl, is_cygwin, is_openbsd, is_haiku, | ||
| is_sunos, windows_proof_rmtree, version_compare, is_linux, | ||
| EnvironmentException | ||
| ) | ||
| @@ -309,6 +309,8 @@ | ||
|
|
||
| @skip_if_not_base_option('b_sanitize') | ||
| def test_generate_gir_with_address_sanitizer(self): | ||
| + if is_musl(): | ||
| + raise SkipTest('asan not available on musl') | ||
| if is_cygwin(): | ||
| raise SkipTest('asan not available on Cygwin') | ||
| if is_openbsd(): | ||
| @@ -453,6 +455,8 @@ | ||
| included on the linker command line when c_link_args is | ||
| set but c_args is not. | ||
| ''' | ||
| + if is_musl(): | ||
| + raise SkipTest('asan not available on musl') | ||
| if is_cygwin(): | ||
| raise SkipTest('asan not available on Cygwin') | ||
| if is_openbsd(): | ||
| @@ -1005,6 +1009,8 @@ | ||
|
|
||
| @skip_if_not_base_option('b_sanitize') | ||
| def test_env_cflags_ldflags(self): | ||
| + if is_musl(): | ||
| + raise SkipTest('asan not available on musl') | ||
| if is_cygwin(): | ||
| raise SkipTest('asan not available on Cygwin') | ||
| if is_openbsd(): | ||
| @@ -1021,6 +1027,8 @@ | ||
|
|
||
| @skip_if_not_base_option('b_sanitize') | ||
| def test_pch_with_address_sanitizer(self): | ||
| + if is_musl(): | ||
| + raise SkipTest('asan not available on musl') | ||
| if is_cygwin(): | ||
| raise SkipTest('asan not available on Cygwin') | ||
| if is_openbsd(): | ||
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want this upstream it needs to do something like check for
__MUSL__.Don't use third-party libraries (meson has none by design and this adds a runtime dep solely to get a testsuite hack to work) which depend on
import sys; analyze_elffile(sys.executable)to check if DT_INTERP contains the word "musl" and fails when python is statically linked orCC=musl-gcc+ a glibc system.