summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes-recipe/meson.bbclass11
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass
index 03fa2c06eb..b343480f9a 100644
--- a/meta/classes-recipe/meson.bbclass
+++ b/meta/classes-recipe/meson.bbclass
@@ -9,7 +9,6 @@ inherit python3native meson-routines qemu
9DEPENDS:append = " meson-native ninja-native" 9DEPENDS:append = " meson-native ninja-native"
10 10
11EXEWRAPPER_ENABLED:class-native = "False" 11EXEWRAPPER_ENABLED:class-native = "False"
12EXEWRAPPER_ENABLED:class-nativesdk = "False"
13EXEWRAPPER_ENABLED ?= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d)}" 12EXEWRAPPER_ENABLED ?= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d)}"
14DEPENDS:append = "${@' qemu-native' if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ''}" 13DEPENDS:append = "${@' qemu-native' if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ''}"
15 14
@@ -127,7 +126,7 @@ cpp_link_args = ${@meson_array('BUILD_LDFLAGS', d)}
127EOF 126EOF
128} 127}
129 128
130do_write_config:append:class-target() { 129write_qemuwrapper() {
131 # Write out a qemu wrapper that will be used as exe_wrapper so that meson 130 # Write out a qemu wrapper that will be used as exe_wrapper so that meson
132 # can run target helper binaries through that. 131 # can run target helper binaries through that.
133 qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" 132 qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
@@ -145,6 +144,14 @@ EOF
145 chmod +x ${WORKDIR}/meson-qemuwrapper 144 chmod +x ${WORKDIR}/meson-qemuwrapper
146} 145}
147 146
147do_write_config:append:class-target() {
148 write_qemuwrapper
149}
150
151do_write_config:append:class-nativesdk() {
152 write_qemuwrapper
153}
154
148# Tell externalsrc that changes to this file require a reconfigure 155# Tell externalsrc that changes to this file require a reconfigure
149CONFIGURE_FILES = "meson.build" 156CONFIGURE_FILES = "meson.build"
150 157