Paul Eggleton : qt4: allow recipes building commercial edition

oe-commits New Martin Jansa 1 participant 4 messages Aug 2, 2012 – Aug 5, 2012 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): 20120731070518.61E5C10217@opal

Martin Jansa

author

2012-08-02 22:27 UTC #1 lore raw

Quoted 24 lines · On Tue, Jul 31, 2012 at 07:05:17AM +0000, [email protected] wrote:

Module: openembedded-core.git
Branch: master
Commit: 2be0058fc4acddab611637656183accd052b40eb
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2be0058fc4acddab611637656183accd052b40eb
Author: Paul Eggleton <[email protected]>
Date:   Tue Jul 31 00:31:00 2012 +0100
qt4: allow recipes building commercial edition
To enable building the commercial edition of Qt (through additional recipes that are *not* provided by OE-Core) we need to tweak a few things:
* Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free
- instead add qt4-x11 to DEPENDS and then have qt4-x11-free include this in its PROVIDES. A commercial equivalent recipe should do the same.
* Add a QT_LICENSE_FILE variable that can be used to specify the license file required by the commercial edition.
* Add a QT_LICENSE_FLAGS variable which the recipe can set to select the license option being used. The default of "-opensource" retains the current behaviour; a commercial recipe should set it to "-commercial".

Quoted 4 lines

Fixes [YOCTO #2505].
Signed-off-by Paul Eggleton <[email protected]>
Signed-off-by Richard Purdie <[email protected]>

After this patch I see, libdummy.prl created again
OE @ ~/projects/shr-chroot $ ll include/WebCore/libdummy.prl -rw-r--r-- 1 bitbake bitbake 651 Aug 2 19:23 include/WebCore/libdummy.prl

originally fixed by:
http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2

Do you have any idea why it's broken again? If you still have log.do_configure logs, can you check for
WARNING: DESTDIR: Cannot access directory '/include/WebCore'
?

Cheers,

Martin Jansa

author

2012-08-03 07:29 UTC #2 lore raw

Quoted 34 lines · Martin Jansa

Quoted 24 lines · On Tue, Jul 31, 2012 at 07:05:17AM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: 2be0058fc4acddab611637656183accd052b40eb
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2be0058fc4acddab611637656183accd052b40eb
Author: Paul Eggleton <[email protected]>
Date:   Tue Jul 31 00:31:00 2012 +0100
qt4: allow recipes building commercial edition
To enable building the commercial edition of Qt (through additional recipes that are *not* provided by OE-Core) we need to tweak a few things:
* Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free
- instead add qt4-x11 to DEPENDS and then have qt4-x11-free include this in its PROVIDES. A commercial equivalent recipe should do the same.
* Add a QT_LICENSE_FILE variable that can be used to specify the license file required by the commercial edition.
* Add a QT_LICENSE_FLAGS variable which the recipe can set to select the license option being used. The default of "-opensource" retains the current behaviour; a commercial recipe should set it to "-commercial".
Quoted 4 lines
Fixes [YOCTO #2505].
Signed-off-by Paul Eggleton <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
After this patch I see, libdummy.prl created again
OE @ ~/projects/shr-chroot $ ll include/WebCore/libdummy.prl -rw-r--r-- 1 bitbake bitbake 651 Aug 2 19:23 include/WebCore/libdummy.prl

Quoted 8 lines

originally fixed by:
http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2
Do you have any idea why it's broken again? If you still have log.do_configure logs, can you check for
WARNING: DESTDIR: Cannot access directory '/include/WebCore'
?
Cheers,

Hmm even more this time:
ISIS_OUT/
ISIS_OUT/include
ISIS_OUT/include/webkit
ISIS_OUT/include/webkit/npapi
ISIS_OUT/include/webkit/npapi/nptypes.h
ISIS_OUT/include/webkit/npapi/npapi.h
ISIS_OUT/include/webkit/npapi/npupp.h
ISIS_OUT/include/webkit/npapi/npruntime.h

Created in dir one level above dir from where bitbake was started.

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-08-05 13:28 UTC #3 lore raw

Quoted 35 lines · Martin Jansa

Quoted 34 lines · Martin Jansa
Quoted 24 lines · On Tue, Jul 31, 2012 at 07:05:17AM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: 2be0058fc4acddab611637656183accd052b40eb
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2be0058fc4acddab611637656183accd052b40eb
Author: Paul Eggleton <[email protected]>
Date:   Tue Jul 31 00:31:00 2012 +0100
qt4: allow recipes building commercial edition
To enable building the commercial edition of Qt (through additional recipes that are *not* provided by OE-Core) we need to tweak a few things:
* Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free
- instead add qt4-x11 to DEPENDS and then have qt4-x11-free include this in its PROVIDES. A commercial equivalent recipe should do the same.
* Add a QT_LICENSE_FILE variable that can be used to specify the license file required by the commercial edition.
* Add a QT_LICENSE_FLAGS variable which the recipe can set to select the license option being used. The default of "-opensource" retains the current behaviour; a commercial recipe should set it to "-commercial".
Quoted 4 lines
Fixes [YOCTO #2505].
Signed-off-by Paul Eggleton <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
After this patch I see, libdummy.prl created again
OE @ ~/projects/shr-chroot $ ll include/WebCore/libdummy.prl -rw-r--r-- 1 bitbake bitbake 651 Aug 2 19:23 include/WebCore/libdummy.prl

Quoted 9 lines

Quoted 8 lines
originally fixed by:
http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2
Do you have any idea why it's broken again? If you still have log.do_configure logs, can you check for
WARNING: DESTDIR: Cannot access directory '/include/WebCore'
?
Cheers,

Ah, this isn't from qt4-x11-free, only that /include/WebCore should be, but I've tried to reproduce it again and even after rebuilding qt4-x11-free, qt4-x11-embedded, qt-mobility-embedded, qt-mobility-x11 it's not created now.

Will try for different arch, because last time I've seen it also only for arm* and not x86 (which I was rebuilding now).

Cheers,

Quoted 14 lines

Hmm even more this time:
ISIS_OUT/
ISIS_OUT/include
ISIS_OUT/include/webkit
ISIS_OUT/include/webkit/npapi
ISIS_OUT/include/webkit/npapi/nptypes.h
ISIS_OUT/include/webkit/npapi/npapi.h
ISIS_OUT/include/webkit/npapi/npupp.h
ISIS_OUT/include/webkit/npapi/npruntime.h
Created in dir one level above dir from where bitbake was started.
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-08-05 14:02 UTC #4 lore raw

PATCH 1/1 qt4-native: fix creating /include directory in build host root

* same fix as
http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2
is needed for native too

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-qt/qt4/qt4-native.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

meta/recipes-qt/qt4/qt4-native.inc +2 -1

index 90ea63c..e00a1f3 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
                     file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
                     file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
-INC_PR = "r15"
+INC_PR = "r16"
 
 inherit native

@@ -18,6 +18,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://g++.conf \
            file://linux.conf \
            file://fix_qkbdtty_qws.patch \
+           file://set-OUTPUT_DIR-if-empty.patch \
 	"
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"

Signature · 1 line

1.7.8.6