Patchwork nativesdk-qt4-tools: remove nativesdk-libx11 for qt-embedded

login
register
mail settings
Submitter Eric Nelson
Date Aug. 11, 2013, 9:36 p.m.
Message ID <1376257018-17066-1-git-send-email-eric.nelson@boundarydevices.com>
Download mbox | patch
Permalink /patch/55455/
State New
Headers show

Comments

Eric Nelson - Aug. 11, 2013, 9:36 p.m.
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Richard Purdie - Aug. 12, 2013, 7:08 a.m.
On Sun, 2013-08-11 at 14:36 -0700, Eric Nelson wrote:
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
>  meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> index cfc6fd8..6ec3225 100644
> --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> @@ -1,5 +1,8 @@
>  DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
> -DEPENDS = "nativesdk-zlib nativesdk-dbus nativesdk-libx11 qt4-native"
> +DEPENDS = "nativesdk-zlib nativesdk-dbus qt4-native"
> +OVERRIDES="${QTNAME}"
> +DEPENDS_append_qt = " nativesdk-libx11"

I'm afraid we can't do this since you just broke any other kind of
override which might get used anywhere by any recipe using this .inc
file. I'd also be wary of adding something as simple as "qt" into
overrides since it can match things more widely than you might want.

Cheers,

Richard

>  SECTION = "libs"
>  HOMEPAGE = "http://qt.nokia.com"
>  LICENSE = "LGPLv2.1 | GPLv3"
Eric Nelson - Aug. 12, 2013, 1:58 p.m.
Thanks Richard,

On 08/12/2013 12:08 AM, Richard Purdie wrote:
> On Sun, 2013-08-11 at 14:36 -0700, Eric Nelson wrote:
>> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
>> ---
>>   meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> index cfc6fd8..6ec3225 100644
>> --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> @@ -1,5 +1,8 @@
>>   DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
>> -DEPENDS = "nativesdk-zlib nativesdk-dbus nativesdk-libx11 qt4-native"
>> +DEPENDS = "nativesdk-zlib nativesdk-dbus qt4-native"
>> +OVERRIDES="${QTNAME}"
>> +DEPENDS_append_qt = " nativesdk-libx11"
>
> I'm afraid we can't do this since you just broke any other kind of
> override which might get used anywhere by any recipe using this .inc
> file. I'd also be wary of adding something as simple as "qt" into
> overrides since it can match things more widely than you might want.
>

I'm a bit of an OE n00b, and I'm not quite sure how to express this
conditional.

meta-toolchain-qte shouldn't depend on nativesdk-libx11, and I'm
not sure how the dependency can be moved to the X11 recipe
recipes_qt/meta/meta-toolchain-qt.bb.
Otavio Salvador - Aug. 12, 2013, 7:26 p.m.
Hello Eric,

On Mon, Aug 12, 2013 at 10:58 AM, Eric Nelson
<eric.nelson@boundarydevices.com> wrote:
>> I'm afraid we can't do this since you just broke any other kind of
>> override which might get used anywhere by any recipe using this .inc
>> file. I'd also be wary of adding something as simple as "qt" into
>> overrides since it can match things more widely than you might want.
>>
>
> I'm a bit of an OE n00b, and I'm not quite sure how to express this
> conditional.
>
> meta-toolchain-qte shouldn't depend on nativesdk-libx11, and I'm
> not sure how the dependency can be moved to the X11 recipe
> recipes_qt/meta/meta-toolchain-qt.bb.

I think you're looking for to:

http://privatepaste.com/cc22a68c56

The missing part for merging it is to /force/ it to be disabled in qt
configure. This was last Richard complain about this patch when I sent
it.
Eric Nelson - Aug. 12, 2013, 8:09 p.m.
On 08/12/2013 12:26 PM, Otavio Salvador wrote:
> Hello Eric,
>
> On Mon, Aug 12, 2013 at 10:58 AM, Eric Nelson
> <eric.nelson@boundarydevices.com> wrote:
>>> I'm afraid we can't do this since you just broke any other kind of
>>> override which might get used anywhere by any recipe using this .inc
>>> file. I'd also be wary of adding something as simple as "qt" into
>>> overrides since it can match things more widely than you might want.
>>>
>>
>> I'm a bit of an OE n00b, and I'm not quite sure how to express this
>> conditional.
>>
>> meta-toolchain-qte shouldn't depend on nativesdk-libx11, and I'm
>> not sure how the dependency can be moved to the X11 recipe
>> recipes_qt/meta/meta-toolchain-qt.bb.
>
> I think you're looking for to:
>
> http://privatepaste.com/cc22a68c56
>
> The missing part for merging it is to /force/ it to be disabled in qt
> configure. This was last Richard complain about this patch when I sent
> it.
>
Thanks Otavio,

I saw the ${@base_contains('DISTRO_FEATURES', construct elsewhere
but got lost in the Python (scratching my head over the trailing 'd').

Patch

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index cfc6fd8..6ec3225 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -1,5 +1,8 @@ 
 DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "nativesdk-zlib nativesdk-dbus nativesdk-libx11 qt4-native"
+DEPENDS = "nativesdk-zlib nativesdk-dbus qt4-native"
+OVERRIDES="${QTNAME}"
+DEPENDS_append_qt = " nativesdk-libx11"
+
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 LICENSE = "LGPLv2.1 | GPLv3"