summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-03 14:04:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-05 00:22:08 +0100
commitc2ba7177f14f94f62beba123fd041bd3df565411 (patch)
tree457d17961daef553b9111497dde247f499df8f84
parentf2c04b450fcbd5e9aa4d18ba047fa70f6becdb9c (diff)
downloadpoky-c2ba7177f14f94f62beba123fd041bd3df565411.tar.gz
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 (From OE-Core rev: 3112ff268d095a65ecb893dd6ca88a85b0f70446) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/meson.bbclass7
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}"
35MESON_HOST_ENDIAN = "bogus-endian" 35MESON_HOST_ENDIAN = "bogus-endian"
36MESON_TARGET_ENDIAN = "bogus-endian" 36MESON_TARGET_ENDIAN = "bogus-endian"
37 37
38EXTRA_OEMESON += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_OEMESON_append = " ${PACKAGECONFIG_CONFARGS}"
39 39
40MESON_CROSS_FILE = "" 40MESON_CROSS_FILE = ""
41MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" 41MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross"
@@ -85,6 +85,7 @@ EOF
85CONFIGURE_FILES = "meson.build" 85CONFIGURE_FILES = "meson.build"
86 86
87meson_do_configure() { 87meson_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
119do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" 120do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
120meson_do_compile() { 121meson_do_compile() {
121 ninja ${PARALLEL_MAKE} 122 ninja -v ${PARALLEL_MAKE}
122} 123}
123 124
124meson_do_install() { 125meson_do_install() {
125 DESTDIR='${D}' ninja ${PARALLEL_MAKEINST} install 126 DESTDIR='${D}' ninja -v ${PARALLEL_MAKEINST} install
126} 127}
127 128
128EXPORT_FUNCTIONS do_configure do_compile do_install 129EXPORT_FUNCTIONS do_configure do_compile do_install