From 69d5356d7664004c9329ca60f6ff29c3b5b296bf Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 12 Aug 2014 19:19:20 +0200 Subject: build: fix libmpv build when using system waf Since the 'syms' tool is shipped in waf's extras, when using system waf the default tool overrides our own. Force our syms tool by providing the tooldir. Fixes #1006 --- wscript_build.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index 090fe280ca..c138d606b6 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -451,7 +451,9 @@ def build(ctx): build_static = ctx.dependency_satisfied('libmpv-static') if build_shared or build_static: if build_shared: - ctx.load("syms") + import os + waftoolsdir = os.path.join(os.path.dirname(__file__), "waftools") + ctx.load("syms", tooldir=waftoolsdir) vre = '^#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION\((.*), (.*)\)$' libmpv_header = ctx.path.find_node("libmpv/client.h").read() major, minor = re.search(vre, libmpv_header, re.M).groups() -- cgit v1.2.3