Qt fixes

PATCH In review Jonathan Liu 3 participants 6 messages Jun 12, 2013 – Jun 13, 2013

Share & tools

Jonathan Liu

author

2013-06-12 01:07 UTC #0 lore raw

cover Qt fixes

A couple of Qt fixes. These have been tested by Paul Eggleton. I have fixed some typos in the commit message for Felipe's patch and dropped the note regarding the build system going crazy as requested by Paul.

Felipe F. Tonello (1):
qt: update qmake2 class to export qconfig.pri mkspec

Jonathan Liu (1):
classes/qmake_base: allow parallel make

 meta/classes/qmake2.bbclass     | 1 +
 meta/classes/qmake_base.bbclass | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Signature · 1 line

1.8.3

Jonathan Liu

author

2013-06-12 01:07 UTC #1 lore raw

PATCH 1/2 qt: update qmake2 class to export qconfig.pri mkspec

From: "Felipe F. Tonello" <[email protected]>

This is necessary when Qt applications want to know variables such as QT_MAJOR_VERSION, QT_VERSION, QT_MINOR_VERSION, GCC version, etc.

Signed-off-by Felipe F. Tonello <[email protected]>

Signed-off-by Jonathan Liu <[email protected]>

---
 meta/classes/qmake2.bbclass | 1 +
 1 file changed, 1 insertion(+)

meta/classes/qmake2.bbclass +1 -0

index 35aaebb..6e73ad2 100644
@@ -6,6 +6,7 @@ inherit qmake_base
 DEPENDS_prepend = "qt4-tools-native "
 
 export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
 export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"

Signature · 1 line

1.8.3

Jonathan Liu

author

2013-06-12 01:07 UTC #2 lore raw

PATCH 2/2 classes/qmake_base: allow parallel make

In reply to Jonathan Liu

Remove MAKEFLAGS= from EXTRA_OEMAKE to allow parallel make.

Signed-off-by Jonathan Liu <[email protected]>

---
 meta/classes/qmake_base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/classes/qmake_base.bbclass +1 -1

index 79040cd..86bbede 100644
@@ -4,7 +4,7 @@ OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
 QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
 
 # We override this completely to eliminate the -e normally passed in
-EXTRA_OEMAKE = ' MAKEFLAGS= '
+EXTRA_OEMAKE = ""
 
 export OE_QMAKE_CC="${CC}"
 export OE_QMAKE_CFLAGS="${CFLAGS}"

Signature · 1 line

1.8.3

Saul Wold

2013-06-13 21:18 UTC #3 lore raw

In reply to Jonathan Liu

Quoted 8 lines · Jonathan Liu

A couple of Qt fixes. These have been tested by Paul Eggleton. I have fixed some typos in the commit message for Felipe's patch and dropped the note regarding the build system going crazy as requested by Paul.
Felipe F. Tonello (1):
qt: update qmake2 class to export qconfig.pri mkspec

Quoted 7 lines

Jonathan Liu (1):
classes/qmake_base: allow parallel make

  meta/classes/qmake2.bbclass     | 1 +
  meta/classes/qmake_base.bbclass | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)

Jonathan,

I think your patches may be causing this failure:

Quoted 4 lines

| mv -f libQtFeedbackE.so.1.2.0 libQtFeedbackE.so libQtFeedbackE.so.1 libQtFeedbackE.so.1.2 ../../lib/
| { test -z "../../lib/" || cd "../../lib/"; } && test $(gdb --version | sed -e 's,[^0-9]\+\([0-9]\)\.\([0-9]\).*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index ." -ex quit 'libQtFeedbackE.so.1.2.0' && test -f libQtFeedbackE.so.1.2.0.gdb-index && objcopy --add-section '.gdb_index=libQtFeedbackE.so.1.2.0.gdb-index' --set-section-flags '.gdb_index=readonly' 'libQtFeedbackE.so.1.2.0' 'libQtFeedbackE.so.1.2.0' && rm -f libQtFeedbackE.so.1.2.0.gdb-index || true
| /bin/sh: gdb: command not found
| /bin/sh: line 0: test: -gt: unary operator expected

See the world build log:
http://autobuilder.yoctoproject.org:8011/builders/nightly-world/builds/169/steps/Building%20Images/logs/stdio

I did not catch this as I have gdb installed locally, but this does not seem very cross-compile friendly and we have not seen it before.

Thanks for looking into this.

Sau!

Martin Jansa

2013-06-13 21:38 UTC #4 lore raw

Quoted 26 lines · Saul Wold

Quoted 8 lines · Jonathan Liu
A couple of Qt fixes. These have been tested by Paul Eggleton. I have fixed some typos in the commit message for Felipe's patch and dropped the note regarding the build system going crazy as requested by Paul.
Felipe F. Tonello (1):
qt: update qmake2 class to export qconfig.pri mkspec
Quoted 7 lines
Jonathan Liu (1):
classes/qmake_base: allow parallel make
  meta/classes/qmake2.bbclass     | 1 +
  meta/classes/qmake_base.bbclass | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
Jonathan,
I think your patches may be causing this failure:
Quoted 4 lines
| mv -f libQtFeedbackE.so.1.2.0 libQtFeedbackE.so libQtFeedbackE.so.1 libQtFeedbackE.so.1.2 ../../lib/
| { test -z "../../lib/" || cd "../../lib/"; } && test $(gdb --version | sed -e 's,[^0-9]\+$[0-9]$\.$[0-9]$.*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index ." -ex quit 'libQtFeedbackE.so.1.2.0' && test -f libQtFeedbackE.so.1.2.0.gdb-index && objcopy --add-section '.gdb_index=libQtFeedbackE.so.1.2.0.gdb-index' --set-section-flags '.gdb_index=readonly' 'libQtFeedbackE.so.1.2.0' 'libQtFeedbackE.so.1.2.0' && rm -f libQtFeedbackE.so.1.2.0.gdb-index || true
| /bin/sh: gdb: command not found
| /bin/sh: line 0: test: -gt: unary operator expected

Quoted 5 lines

See the world build log:
http://autobuilder.yoctoproject.org:8011/builders/nightly-world/builds/169/steps/Building%20Images/logs/stdio
I did not catch this as I have gdb installed locally, but this does not seem very cross-compile friendly and we have not seen it before.

Is qt4 now trying to use gdb_dwarf_index? see
https://github.com/meta-qt5/meta-qt5/commit/1a272bc79d0e9aba9385d00b0aa1acf116552ad5

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Jonathan Liu

author

2013-06-13 23:09 UTC #5 lore raw

Quoted 25 lines · Martin Jansa

Quoted 24 lines · Saul Wold
Quoted 8 lines · Jonathan Liu
A couple of Qt fixes. These have been tested by Paul Eggleton. I have fixed some typos in the commit message for Felipe's patch and dropped the note regarding the build system going crazy as requested by Paul.
Felipe F. Tonello (1):
qt: update qmake2 class to export qconfig.pri mkspec
Quoted 7 lines
Jonathan Liu (1):
classes/qmake_base: allow parallel make
   meta/classes/qmake2.bbclass     | 1 +
   meta/classes/qmake_base.bbclass | 2 +-
   2 files changed, 2 insertions(+), 1 deletion(-)
Jonathan,
I think your patches may be causing this failure:
Quoted 4 lines
| mv -f libQtFeedbackE.so.1.2.0 libQtFeedbackE.so libQtFeedbackE.so.1 libQtFeedbackE.so.1.2 ../../lib/
| { test -z "../../lib/" || cd "../../lib/"; } && test $(gdb --version | sed -e 's,[^0-9]\+$[0-9]$\.$[0-9]$.*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index ." -ex quit 'libQtFeedbackE.so.1.2.0' && test -f libQtFeedbackE.so.1.2.0.gdb-index && objcopy --add-section '.gdb_index=libQtFeedbackE.so.1.2.0.gdb-index' --set-section-flags '.gdb_index=readonly' 'libQtFeedbackE.so.1.2.0' 'libQtFeedbackE.so.1.2.0' && rm -f libQtFeedbackE.so.1.2.0.gdb-index || true
| /bin/sh: gdb: command not found
| /bin/sh: line 0: test: -gt: unary operator expected

Quoted 8 lines

Quoted 5 lines
See the world build log:
http://autobuilder.yoctoproject.org:8011/builders/nightly-world/builds/169/steps/Building%20Images/logs/stdio
I did not catch this as I have gdb installed locally, but this does not seem very cross-compile friendly and we have not seen it before.
Is qt4 now trying to use gdb_dwarf_index? see
https://github.com/meta-qt5/meta-qt5/commit/1a272bc79d0e9aba9385d00b0aa1acf116552ad5

It seems qt4 has gdb_dwarf_index enabled in the CONFIG. In the target sysroot, /usr/share/qt4/mkspecs/linux-oe-g++/qmake.conf contains:
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index

Regards,
Jonathan