Meson fixups for Windows #3039
Merged
Meson fixups for Windows #3039
Conversation
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
It needs to know about the correct include directories on its own.
libm is not guaranteed to exist. POSIX requires the math functions to exist, but doesn't require to have it be a standalone library. On platforms where libm exists as a standalone library, it will always be found by meson -- it is shipped with libc. If it is not found, then we can safely assume the linker will make the math functions available by default. See https://mesonbuild.com/howtox.html#add-math-library-lm-portably Fixes building with bin_tests=true on Windows.
While trying to raise an exception on failures, it instead raised an
exception for misusing the exception. CalledProcessError is only
supposed to be used when given a return code and a command, and it
prints:
Command '{cmd}' returned non-zero exit status {ret}
Passing an error message string instead, just errored out with:
TypeError: __init__() missing 1 required positional argument
Instead use the subprocess module's base error which does accept string
messages. Everything that used to error out, still errors out, but now
they do so with a slightly prettier console message.
Contributor
Author
|
Aside: https://github.com/mesonbuild/wrapdb/actions/runs/1770447908 (This is after I backport the fixes.) The build itself is green on meson+MSVC, but the test is red: |
Currently the build errors out with: ``` ERROR: This script does not work on Python 3.6 The minimum supported Python version is 3.7. Please use https://bootstrap.pypa.io/pip/3.6/get-pip.py instead. ``` While in theory this advice could be followed to get a better pip on xenial, Meson has now deprecated python 3.6 support too, and the next (unreleased) version requires python 3.7 There are a couple solutions to this: - hold the version of pip, allow pip to only install 3.6-compatible versions of meson (effectively freezing meson going forward) - install python 3.7 on xenial - update to a 2-year-old image instead of a 4-year-old one Option 3 is the simplest.
Contributor
Author
|
Alright, let's try to actually fix that meson CI on travis... |
Cyan4973
approved these changes
Feb 4, 2022
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Three changes:
*.rcfiles) was not instructed where to find zstd.h