diff options
| -rw-r--r-- | classes/qmake5_base.bbclass | 5 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtjsbackend-native.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtjsbackend.inc | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index d114c548..604397b1 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -8,9 +8,12 @@ QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" OE_QMAKE_PLATFORM_NATIVE = "linux-oe-g++" OE_QMAKE_PLATFORM = "linux-oe-g++" +# Add -d to show debug output from every qmake call, but it prints *a lot* +OE_QMAKE_DEBUG_OUTPUT = "-d" + EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" -EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ +EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -after \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ STRIP="${OE_QMAKE_STRIP}" \ diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 09f636f4..03bb29fd 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -81,7 +81,7 @@ do_configure_prepend() { unset LD (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" - bin/qmake -d ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" + bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } do_install() { diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 69251835..bc95d244 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -79,8 +79,8 @@ do_configure_append() { -platform ${OE_QMAKESPEC} \ -xplatform linux-oe-g++ \ ${QT_CONFIG_FLAGS} - - ${OE_QMAKE_QMAKE} -r -d ${S} + + bin/qmake -r ${OE_QMAKE_DEBUG_OUTPUT} ${S} } do_compile_append() { diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index e74ffd91..fc67e3e0 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -14,7 +14,7 @@ do_configure () { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - ${OE_QMAKE_QMAKE} -r -d ${S} + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } do_install() { diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 56bb854c..ea5bd86d 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -21,7 +21,7 @@ do_configure() { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - ${OE_QMAKE_QMAKE} -d -r + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } do_install() { diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 707e1da4..31eee80b 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -22,7 +22,7 @@ do_configure () { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - ${OE_QMAKE_QMAKE} -r -d ${S} + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } do_install_append () { |