diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-07-03 14:04:09 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-04 12:27:27 +0100 |
| commit | 3112ff268d095a65ecb893dd6ca88a85b0f70446 (patch) | |
| tree | ccc1aa59bd462d02b8690913a9bbaaded0d09990 | |
| parent | 844f8d46f522a994dbff00245c4ffb07452577a8 (diff) | |
| download | openembedded-core-3112ff268d095a65ecb893dd6ca88a85b0f70446.tar.gz openembedded-core-3112ff268d095a65ecb893dd6ca88a85b0f70446.tar.bz2 openembedded-core-3112ff268d095a65ecb893dd6ca88a85b0f70446.zip | |
meson: various class improvements
- Ensure that the PACKAGECONFIG arguments are always in EXTRA_OEMESON
- Log the arguments that are being passed in do_configure.
- Do verbose builds so the compile logs are useful for debugging build problems
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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}" MESON_HOST_ENDIAN = "bogus-endian" MESON_TARGET_ENDIAN = "bogus-endian" -EXTRA_OEMESON += "${PACKAGECONFIG_CONFARGS}" +EXTRA_OEMESON_append = " ${PACKAGECONFIG_CONFARGS}" MESON_CROSS_FILE = "" MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" @@ -85,6 +85,7 @@ EOF CONFIGURE_FILES = "meson.build" meson_do_configure() { + bbnote Executing meson ${EXTRA_OEMESON}... if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then cat ${B}/meson-logs/meson-log.txt bbfatal_log meson failed @@ -118,11 +119,11 @@ meson_do_configure_prepend_class-native() { do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" meson_do_compile() { - ninja ${PARALLEL_MAKE} + ninja -v ${PARALLEL_MAKE} } meson_do_install() { - DESTDIR='${D}' ninja ${PARALLEL_MAKEINST} install + DESTDIR='${D}' ninja -v ${PARALLEL_MAKEINST} install } EXPORT_FUNCTIONS do_configure do_compile do_install |