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.

python/build/meson.py: set BOOST_ROOT for Meson 0.54
ca705e1e · Max Kellermann · d9f9b3df · ca705e1e · ca705e1e
Commit ca705e1e authored Jul 01, 2020 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

NEWS NEWS +2 -0

meson.py python/build/meson.py +6 -1

No files found.
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ ver 0.21.25 (not yet released)
 * input
  - file: detect premature end of file
  - 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)
 * protocol

--- 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=[],