summaryrefslogtreecommitdiffstats
path: root/meta/classes-recipe
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r--meta/classes-recipe/meson.bbclass6
1 files 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() {
152 mkdir -p "${B}/meson-private/tmp" 152 mkdir -p "${B}/meson-private/tmp"
153 export TMPDIR="${B}/meson-private/tmp" 153 export TMPDIR="${B}/meson-private/tmp"
154 bbnote Executing meson ${EXTRA_OEMESON}... 154 bbnote Executing meson ${EXTRA_OEMESON}...
155 if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then 155 if ! meson setup ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then
156 bbfatal_log meson failed 156 bbfatal_log meson failed
157 fi 157 fi
158} 158}
@@ -169,11 +169,11 @@ do_configure[postfuncs] += "meson_do_qa_configure"
169 169
170do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" 170do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
171meson_do_compile() { 171meson_do_compile() {
172 ninja -v ${PARALLEL_MAKE} 172 meson compile -v ${PARALLEL_MAKE}
173} 173}
174 174
175meson_do_install() { 175meson_do_install() {
176 DESTDIR='${D}' ninja -v ${PARALLEL_MAKEINST} install 176 meson install --destdir ${D}
177} 177}
178 178
179EXPORT_FUNCTIONS do_configure do_compile do_install 179EXPORT_FUNCTIONS do_configure do_compile do_install