From fbecb05bf47dfdda61dac953b78f998273772b0d Mon Sep 17 00:00:00 2001 From: Sam Bazley Date: Sun, 26 Dec 2021 15:36:30 +0000 Subject: [PATCH] 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]. --- python/build/meson.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/python/build/meson.py b/python/build/meson.py index bb0b55a3f..2ad2904bb 100644 --- a/python/build/meson.py +++ b/python/build/meson.py @@ -53,19 +53,21 @@ pkgconfig = '{toolchain.pkg_config}' f.write(f""" [properties] root = '{toolchain.install_prefix}' - -[built-in options] -c_args = {repr((toolchain.cppflags + ' ' + toolchain.cflags).split())} -c_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())} - -cpp_args = {repr((toolchain.cppflags + ' ' + toolchain.cxxflags).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""" +[built-in options] +c_args = {repr((toolchain.cppflags + ' ' + toolchain.cflags).split())} +c_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())} + +cpp_args = {repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split())} +cpp_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())} """) f.write(f"""