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.

Signed-off-by: Ross Burton <[email protected]>
---
 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 765e81bc4f8..1014bd058ea 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
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#174495): 
https://lists.openembedded.org/g/openembedded-core/message/174495
Mute This Topic: https://lists.openembedded.org/mt/95623429/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to