From: Ross Burton <ross.burton@intel.com>
Date: Tue, 31 Jul 2018 17:05:40 +0000 (+0100)
Subject: meson: don't dump full error log on failure
X-Git-Tag: uninative-2.3~804
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=09917f582aa1a7b752fa96303e06f9f4712a1d86;p=openembedded-core.git

meson: don't dump full error log on failure

If the configure fails then we don't really want to see hundreds of lines of
test output (this would be similar to dumping out autoconf's config.log).  The
error includes the path of the full log if further debugging is required.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 66c44e8bb2..e3b452786d 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -101,7 +101,6 @@ 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
     fi
 }