From c9a6b5124997a0fc7a71dd42e70fb0d07f3b3728 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 12 Dec 2022 15:25:42 +0000 Subject: [PATCH] meson: always use meson subcommands Invoking meson with just paths is a deprecated use of the binary and causes warnings, so call 'meson setup' explicitly. Whilst doing this cleanup, we can also call 'meson compile' and 'meson install' instead of ninja. (From OE-Core rev: b248cb1ada04f57a5c4590c7e5efa04f68bc8843) Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-recipe/meson.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index 765e81bc4f..1014bd058e 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -152,7 +152,7 @@ meson_do_configure() { mkdir -p "${B}/meson-private/tmp" export TMPDIR="${B}/meson-private/tmp" bbnote Executing meson ${EXTRA_OEMESON}... - if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then + if ! meson setup ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then bbfatal_log meson failed fi } @@ -169,11 +169,11 @@ do_configure[postfuncs] += "meson_do_qa_configure" do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" meson_do_compile() { - ninja -v ${PARALLEL_MAKE} + meson compile -v ${PARALLEL_MAKE} } meson_do_install() { - DESTDIR='${D}' ninja -v ${PARALLEL_MAKEINST} install + meson install --destdir ${D} } EXPORT_FUNCTIONS do_configure do_compile do_install