Skip to contentSkip to conversation

qt4-embedded: avoid circular dependencies for reciped providing qt4-embedded

PATCH In review Björn Krombholz 5 participants 7 messages Sep 19, 2010 – Sep 21, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt4-embedded: avoid circular dependencies for reciped providing qt4-embedded

* qt4e.bbclass did add a dependency on qt4-embedded for recipes providing qt4-embedded. This breaks building of qt4-embedded-gles in 2 ways:

1. PREFERRED_PROVIDER_qt4-embedded = qt4-embedded-gles adds a circular dependency.

2. bitbake qt4-embedded-gles
first builds and installs qt4-embedded to sysroots/ and then fails to link the qt4-embedded-gles build against the libs in sysroots which don't provide the gl specific symbols

* The fix avoids adding the dependency for package names _beginning_ with 'qt4-embedded' (as it is done in the x11 version).

---
 classes/qt4e.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
classes/qt4e.bbclass +1 -1
index f72e06b..303b79b 100644
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}"
+DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-embedded')]}"
 inherit qmake2
 
 QT_DIR_NAME = "qtopia"
Signature · 1 line
1.7.1
#1 lore raw

On 09/20/2010 05:59 AM, Björn Krombholz wrote:
=

classes/qt4e.bbclass line 2

Quoted 4 lines
classes/qt4e.bbclass +1 -1
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}"
+DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-embedded')]}"
 inherit qmake2

use startsWith and avoid the extra array allocation?

#2 lore raw

2010/9/20 Holger Freyther <[email protected]>

Quoted 7 lines · Björn Krombholz
Quoted 4 lines
classes/qt4e.bbclass +1 -1
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}"
+DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-embedded')]}"

 inherit qmake2

use startsWith and avoid the extra array allocation?

Array slicing just provides a new mapping onto the original array and doesn't copy any data.

I chose this syntax to make it consistent with qt4x11.bbclass

#3 lore raw

Is it possible to apply this patch soon ? I need the gles version of qt4-embedded. At the time I workaround this problem by a modified qt4-embedded recipe.

-----Ursprüngliche Nachricht-----
Von: [email protected] [mailto:[email protected]] Im Auftrag von Björn Krombholz
Gesendet: Montag, 20. September 2010 20:16
An: [email protected]
Betreff: Re: [oe] [PATCH] qt4-embedded: avoid circular dependencies for reciped providing qt4-embedded

2010/9/20 Holger Freyther <[email protected]>

Quoted 7 lines · Björn Krombholz
Quoted 4 lines
classes/qt4e.bbclass +1 -1
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}"
+DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-embedded')]}"

 inherit qmake2

use startsWith and avoid the extra array allocation?

Array slicing just provides a new mapping onto the original array and doesn't copy any data.

I chose this syntax to make it consistent with qt4x11.bbclass

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#4 lore raw

2010/9/21 Hauser, Wolfgang (external) <[email protected]>:

Quoted 1 line

Is it possible to apply this patch soon ? I need the gles version of qt4-embedded. At the time I workaround this problem by a modified qt4-embedded recipe.

Can't judge the details of your patch (and can't push from here anyway). What I normally do in those cases is keep the patched recipe in an overlay (and discard it when the patch is applied).

Frans

Quoted 31 lines

-----Ursprüngliche Nachricht-----
Von: [email protected] [mailto:[email protected]] Im Auftrag von Björn Krombholz
Gesendet: Montag, 20. September 2010 20:16
An: [email protected]
Betreff: Re: [oe] [PATCH] qt4-embedded: avoid circular dependencies for reciped providing qt4-embedded

2010/9/20 Holger Freyther <[email protected]>

Quoted 7 lines · Björn Krombholz
Quoted 4 lines
classes/qt4e.bbclass +1 -1
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}"
+DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-embedded')]}"

 inherit qmake2

use startsWith and avoid the extra array allocation?

Array slicing just provides a new mapping onto the original array and doesn't copy any data.

I chose this syntax to make it consistent with qt4x11.bbclass

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#5 lore raw
In reply to Hauser, Wolfgang (external)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

It was applied yesterday already:
http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=224e98468078e9267b0b4c2d72bfb0eb3b2863ec

Quoted 20 lines · Wolfgang (external)

Is it possible to apply this patch soon ? I need the gles version of qt4-embedded. At the time I workaround this problem by a modified qt4-embedded recipe.

-----Ursprüngliche Nachricht-----
Von: [email protected] [mailto:[email protected]] Im Auftrag von Björn Krombholz
Gesendet: Montag, 20. September 2010 20:16
An: [email protected]
Betreff: Re: [oe] [PATCH] qt4-embedded: avoid circular dependencies for reciped providing qt4-embedded

2010/9/20 Holger Freyther <[email protected]>

Quoted 7 lines · Björn Krombholz

classes/qt4e.bbclass line 2

Quoted 4 lines
classes/qt4e.bbclass +1 -1
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}"
+DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-embedded')]}"
 inherit qmake2

use startsWith and avoid the extra array allocation?

Array slicing just provides a new mapping onto the original array and doesn't copy any data.

Quoted 6 lines

I chose this syntax to make it consistent with qt4x11.bbclass

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMmK/SMkyGM64RGpERAt+6AJ90NQAJvd/iJCE7hr35N54LvvzVAQCfVkqr ePDrcvS2KaENyo6CzPgnd9I=
=uqo0
-----END PGP SIGNATURE-----

#6 lore raw
In reply to Björn Krombholz
Quoted 6 lines · Björn Krombholz
Quoted 1 line

use startsWith and avoid the extra array allocation?

Array slicing just provides a new mapping onto the original array and doesn't copy any data.

I chose this syntax to make it consistent with qt4x11.bbclass

Well, it creates a new object, and you need to count things by hand (even if humans have hands they tend to fail on that). Using the starts with function is safer and avoid creating extra objects. :)