From: Ross Burton Date: Thu, 11 Dec 2025 17:55:45 +0000 (+0000) Subject: classes/meson: no need to export STAGING_DIR_HOST X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d96b29513d016fc1a026ef18b5fa31b893cdf521;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git classes/meson: no need to export STAGING_DIR_HOST If we use ${} for STAGING_DIR_HOST then the correct paths get written into the command earlier. Also use STAGING_LIBDIR, it's the same end result but more idiomatic. Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index 0709a1313a..2c098771fe 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -50,9 +50,6 @@ MESON_CROSS_FILE = "" MESON_CROSS_FILE:class-target = "--cross-file ${WORKDIR}/meson.cross" MESON_CROSS_FILE:class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" -# Needed to set up qemu wrapper below -export STAGING_DIR_HOST - def rust_tool(d, target_var): rustc = d.getVar('RUSTC') if not rustc: @@ -141,7 +138,7 @@ EOF write_qemuwrapper() { # Write out a qemu wrapper that will be used as exe_wrapper so that meson # can run target helper binaries through that. - qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" + qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_LIBDIR}','${STAGING_BASELIBDIR}'])}" cat > ${WORKDIR}/meson-qemuwrapper << EOF #!/bin/sh # Use a modules directory which doesn't exist so we don't load random things