Merge branch 'v0.21.x'

2020-07-01 16:56:17 +02:00
parent 3c5ef504f8 ca705e1e37
commit 3d7147390f
6 changed files with 38 additions and 5 deletions
--- 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=[],