Skip to content

M
mpd
Commit fbecb05b authored by Sam Bazley's avatar Sam Bazley Committed by Max Kellermann
Browse files
Options

Fix Android build error: needs_exe_wrapper

lib/src/libmpdclient-2.19/meson.build:1:0: ERROR: Unknown options: "needs_exe_wrapper" The "needs_exe_wrapper" option was incorrectly set under [built-in options] rather than [properties].
parent 49837033
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
python/build/meson.py
View file @ fbecb05b
...@@ -53,7 +53,15 @@ pkgconfig = '{toolchain.pkg_config}' ...@@ -53,7 +53,15 @@ pkgconfig = '{toolchain.pkg_config}'
f.write(f""" f.write(f"""
[properties] [properties]
root = '{toolchain.install_prefix}' root = '{toolchain.install_prefix}'
""")
if 'android' in toolchain.arch:
f.write("""
# Keep Meson from executing Android-x86 test binariees
needs_exe_wrapper = true
""")
f.write(f"""
[built-in options] [built-in options]
c_args = {repr((toolchain.cppflags + ' ' + toolchain.cflags).split())} c_args = {repr((toolchain.cppflags + ' ' + toolchain.cflags).split())}
c_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())} c_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())}
...@@ -62,12 +70,6 @@ cpp_args = {repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split())} ...@@ -62,12 +70,6 @@ cpp_args = {repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split())}
cpp_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())} cpp_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())}
""") """)
if 'android' in toolchain.arch:
f.write("""
# Keep Meson from executing Android-x86 test binariees
needs_exe_wrapper = true
""")
f.write(f""" f.write(f"""
[host_machine] [host_machine]
system = '{system}' system = '{system}'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment