sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

qmake: allow to disable debug output 

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2013-04-28 02:13:28 +02:00
parent af9d25bbe7
commit 09516373c0
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/qmake5_base.bbclass
View File

@ -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}" \

2
recipes-qt/qt5/qtbase-native.inc
View File

@ -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() {

4
recipes-qt/qt5/qtbase.inc
View File

@ -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() {

2
recipes-qt/qt5/qtdeclarative.inc
View File

@ -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() {

2
recipes-qt/qt5/qtjsbackend-native.inc
View File

@ -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() {

2
recipes-qt/qt5/qtjsbackend.inc
View File

@ -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 () {