From aaf6e3b58d3e8b4c4e2645986a0b979f45b09181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= Date: Fri, 29 Jul 2016 01:03:19 +0300 Subject: 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. --- wscript_build.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'wscript_build.py') 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 -- cgit v1.2.3