summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2020-07-01 16:37:50 +0200
committerMax Kellermann <max@musicpd.org>2020-07-01 16:55:28 +0200
commitca705e1e37e2cd20d89e707c51cdb33a4d33245e (patch)
treeda8135e89da272408acb9eab4d6665146d90257b /python
parentd9f9b3df1063b1a7c547484cec8dafc54da8c216 (diff)
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.
Diffstat (limited to 'python')
-rw-r--r--python/build/meson.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/python/build/meson.py b/python/build/meson.py
index 93797f382..377969b28 100644
--- a/python/build/meson.py
+++ b/python/build/meson.py
@@ -91,7 +91,12 @@ def configure(toolchain, src, build, args=()):
'--cross-file', cross_file,
] + 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):
def __init__(self, url, md5, installed, configure_args=[],