* [PATCH 0/2] Qt fixes
@ 2013-06-12 1:21 Jonathan Liu
2013-06-12 1:21 ` [PATCH 1/2] qt: update qmake2 class to export qconfig.pri mkspec Jonathan Liu
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jonathan Liu @ 2013-06-12 1:21 UTC (permalink / raw)
To: openembedded-core
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(-)
--
1.8.3
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] qt: update qmake2 class to export qconfig.pri mkspec
2013-06-12 1:21 [PATCH 0/2] Qt fixes Jonathan Liu
@ 2013-06-12 1:21 ` Jonathan Liu
2013-06-12 1:21 ` [PATCH 2/2] classes/qmake_base: allow parallel make Jonathan Liu
2013-06-13 21:18 ` [PATCH 0/2] Qt fixes Saul Wold
2 siblings, 0 replies; 6+ messages in thread
From: Jonathan Liu @ 2013-06-12 1:21 UTC (permalink / raw)
To: openembedded-core
From: "Felipe F. Tonello" <eu@felipetonello.com>
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 <eu@felipetonello.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
meta/classes/qmake2.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
index 35aaebb..6e73ad2 100644
--- a/meta/classes/qmake2.bbclass
+++ b/meta/classes/qmake2.bbclass
@@ -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"
--
1.8.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] classes/qmake_base: allow parallel make
2013-06-12 1:21 [PATCH 0/2] Qt fixes Jonathan Liu
2013-06-12 1:21 ` [PATCH 1/2] qt: update qmake2 class to export qconfig.pri mkspec Jonathan Liu
@ 2013-06-12 1:21 ` Jonathan Liu
2013-06-13 21:18 ` [PATCH 0/2] Qt fixes Saul Wold
2 siblings, 0 replies; 6+ messages in thread
From: Jonathan Liu @ 2013-06-12 1:21 UTC (permalink / raw)
To: openembedded-core
Remove MAKEFLAGS= from EXTRA_OEMAKE to allow parallel make.
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
meta/classes/qmake_base.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass
index 79040cd..86bbede 100644
--- a/meta/classes/qmake_base.bbclass
+++ b/meta/classes/qmake_base.bbclass
@@ -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}"
--
1.8.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] Qt fixes
2013-06-12 1:21 [PATCH 0/2] Qt fixes Jonathan Liu
2013-06-12 1:21 ` [PATCH 1/2] qt: update qmake2 class to export qconfig.pri mkspec Jonathan Liu
2013-06-12 1:21 ` [PATCH 2/2] classes/qmake_base: allow parallel make Jonathan Liu
@ 2013-06-13 21:18 ` Saul Wold
2013-06-13 21:38 ` Martin Jansa
2 siblings, 1 reply; 6+ messages in thread
From: Saul Wold @ 2013-06-13 21:18 UTC (permalink / raw)
To: Jonathan Liu; +Cc: openembedded-core
On 06/11/2013 06:21 PM, Jonathan Liu wrote:
> 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(-)
>
Jonathan,
I think your patches may be causing this failure:
> | 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!
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] Qt fixes
2013-06-13 21:18 ` [PATCH 0/2] Qt fixes Saul Wold
@ 2013-06-13 21:38 ` Martin Jansa
2013-06-13 23:04 ` Jonathan Liu
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-06-13 21:38 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1944 bytes --]
On Thu, Jun 13, 2013 at 02:18:21PM -0700, Saul Wold wrote:
> On 06/11/2013 06:21 PM, Jonathan Liu wrote:
> > 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(-)
> >
>
> Jonathan,
>
> I think your patches may be causing this failure:
>
> > | 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.
Is qt4 now trying to use gdb_dwarf_index? see
https://github.com/meta-qt5/meta-qt5/commit/1a272bc79d0e9aba9385d00b0aa1acf116552ad5
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] Qt fixes
2013-06-13 21:38 ` Martin Jansa
@ 2013-06-13 23:04 ` Jonathan Liu
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Liu @ 2013-06-13 23:04 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 14/06/2013 7:38 AM, Martin Jansa wrote:
> On Thu, Jun 13, 2013 at 02:18:21PM -0700, Saul Wold wrote:
>> On 06/11/2013 06:21 PM, Jonathan Liu wrote:
>>> 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(-)
>>>
>> Jonathan,
>>
>> I think your patches may be causing this failure:
>>
>>> | 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.
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-06-13 23:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-12 1:21 [PATCH 0/2] Qt fixes Jonathan Liu
2013-06-12 1:21 ` [PATCH 1/2] qt: update qmake2 class to export qconfig.pri mkspec Jonathan Liu
2013-06-12 1:21 ` [PATCH 2/2] classes/qmake_base: allow parallel make Jonathan Liu
2013-06-13 21:18 ` [PATCH 0/2] Qt fixes Saul Wold
2013-06-13 21:38 ` Martin Jansa
2013-06-13 23:04 ` Jonathan Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox