summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Ekström <jeebjp@gmail.com>2016-07-29 01:03:19 +0300
committerwm4 <wm4@nowhere>2016-07-30 00:02:40 +0200
commitaaf6e3b58d3e8b4c4e2645986a0b979f45b09181 (patch)
treee4c5c4d5c9027da66b83bd47d312fb7473106b1b
parentf95cde60ff02e897088d35052426964a3db90eb7 (diff)
downloadmpv-aaf6e3b58d3e8b4c4e2645986a0b979f45b09181.tar.bz2
mpv-aaf6e3b58d3e8b4c4e2645986a0b979f45b09181.tar.xz
wscript: add proper non-version'd SONAME for Android
This seems to have become a requirement since API target 23+, and matches what FFmpeg does.
-rw-r--r--wscript_build.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/wscript_build.py b/wscript_build.py
index 257be27462..ebbc3e8b8c 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -513,7 +513,13 @@ def build(ctx):
"install_path": ctx.env.LIBDIR,
}
- if not ctx.dependency_satisfied('android'):
+ if shared and ctx.dependency_satisfied('android'):
+ # for Android we just add the linker flag without version
+ # as we still need the SONAME for proper linkage.
+ # (LINKFLAGS logic taken from waf's apply_vnum in ccroot.py)
+ v=ctx.env.SONAME_ST%'libmpv.so'
+ ctx.env.append_value('LINKFLAGS',v.split())
+ else:
# for all other configurations we want SONAME to be used
libmpv_kwargs["vnum"] = libversion