Commit ca705e1e authored by Max Kellermann's avatar Max Kellermann

python/build/meson.py: set BOOST_ROOT for Meson 0.54

Commit https://github.com/mesonbuild/meson/commit/08224dafcba1b694fb624553e7d84deb565aae22 changed Meson to require BOOST_ROOT for cross builds.
parent d9f9b3df
...@@ -4,6 +4,8 @@ ver 0.21.25 (not yet released) ...@@ -4,6 +4,8 @@ ver 0.21.25 (not yet released)
* input * input
- file: detect premature end of file - file: detect premature end of file
- smbclient: don't send credentials to MPD clients - smbclient: don't send credentials to MPD clients
* Windows/Android:
- fix Boost detection after breaking change in Meson 0.54
ver 0.21.24 (2020/06/10) ver 0.21.24 (2020/06/10)
* protocol * protocol
......
...@@ -91,7 +91,12 @@ def configure(toolchain, src, build, args=()): ...@@ -91,7 +91,12 @@ def configure(toolchain, src, build, args=()):
'--cross-file', cross_file, '--cross-file', cross_file,
] + args ] + args
subprocess.check_call(configure, env=toolchain.env) env = toolchain.env.copy()
# Meson 0.54 requires the BOOST_ROOT environment variable
env['BOOST_ROOT'] = toolchain.install_prefix
subprocess.check_call(configure, env=env)
class MesonProject(Project): class MesonProject(Project):
def __init__(self, url, md5, installed, configure_args=[], def __init__(self, url, md5, installed, configure_args=[],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment