diff options
Diffstat (limited to 'meta/classes/meson.bbclass')
-rw-r--r-- | meta/classes/meson.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index e572344bd2..c36b634b43 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass | |||
@@ -35,7 +35,7 @@ MESON_LINK_ARGS = "${MESON_TOOLCHAIN_ARGS} ${LDFLAGS}" | |||
35 | MESON_HOST_ENDIAN = "bogus-endian" | 35 | MESON_HOST_ENDIAN = "bogus-endian" |
36 | MESON_TARGET_ENDIAN = "bogus-endian" | 36 | MESON_TARGET_ENDIAN = "bogus-endian" |
37 | 37 | ||
38 | EXTRA_OEMESON += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_OEMESON_append = " ${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | MESON_CROSS_FILE = "" | 40 | MESON_CROSS_FILE = "" |
41 | MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" | 41 | MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" |
@@ -85,6 +85,7 @@ EOF | |||
85 | CONFIGURE_FILES = "meson.build" | 85 | CONFIGURE_FILES = "meson.build" |
86 | 86 | ||
87 | meson_do_configure() { | 87 | meson_do_configure() { |
88 | bbnote Executing meson ${EXTRA_OEMESON}... | ||
88 | if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then | 89 | if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then |
89 | cat ${B}/meson-logs/meson-log.txt | 90 | cat ${B}/meson-logs/meson-log.txt |
90 | bbfatal_log meson failed | 91 | bbfatal_log meson failed |
@@ -118,11 +119,11 @@ meson_do_configure_prepend_class-native() { | |||
118 | 119 | ||
119 | do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" | 120 | do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" |
120 | meson_do_compile() { | 121 | meson_do_compile() { |
121 | ninja ${PARALLEL_MAKE} | 122 | ninja -v ${PARALLEL_MAKE} |
122 | } | 123 | } |
123 | 124 | ||
124 | meson_do_install() { | 125 | meson_do_install() { |
125 | DESTDIR='${D}' ninja ${PARALLEL_MAKEINST} install | 126 | DESTDIR='${D}' ninja -v ${PARALLEL_MAKEINST} install |
126 | } | 127 | } |
127 | 128 | ||
128 | EXPORT_FUNCTIONS do_configure do_compile do_install | 129 | EXPORT_FUNCTIONS do_configure do_compile do_install |