summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Palus <atler@pld-linux.org>2014-08-12 19:19:20 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-08-13 17:09:45 +0200
commit69d5356d7664004c9329ca60f6ff29c3b5b296bf (patch)
tree413a2dd011cbacee4e71c8c26f52b11115772635
parent9ed9c68fda8d099f08bdd95d2e9392d0aa9eee59 (diff)
downloadmpv-69d5356d7664004c9329ca60f6ff29c3b5b296bf.tar.bz2
mpv-69d5356d7664004c9329ca60f6ff29c3b5b296bf.tar.xz
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
-rw-r--r--wscript_build.py4
1 files changed, 3 insertions, 1 deletions
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()