Patchwork [v2,4/5] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 17, 2013, 5:53 p.m.
Message ID <1361123592-32572-4-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/44759/
State New
Headers show

Comments

Otavio Salvador - Feb. 17, 2013, 5:53 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Saul Wold - Feb. 19, 2013, 4:54 p.m.
On 02/17/2013 09:53 AM, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> index cfc6fd8..d7ce8dc 100644
> --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> @@ -1,10 +1,10 @@
>   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 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11', '', d)} qt4-native"
>   SECTION = "libs"
>   HOMEPAGE = "http://qt.nokia.com"
>   LICENSE = "LGPLv2.1 | GPLv3"
>
> -INC_PR = "r13"
> +INC_PR = "r14"
>
>   FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
>
>

Does this also need a change to the EXTRA_OECONF to ensure that the x11 
functionality is disabled by default in the configuration.

Thanks
	Sau!
Otavio Salvador - Feb. 19, 2013, 4:57 p.m.
On Tue, Feb 19, 2013 at 1:54 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 02/17/2013 09:53 AM, Otavio Salvador wrote:
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>   meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> index cfc6fd8..d7ce8dc 100644
>> --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> @@ -1,10 +1,10 @@
>>   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
>> ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11', '',
>> d)} qt4-native"
>>   SECTION = "libs"
>>   HOMEPAGE = "http://qt.nokia.com"
>>   LICENSE = "LGPLv2.1 | GPLv3"
>>
>> -INC_PR = "r13"
>> +INC_PR = "r14"
>>
>>   FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
>>
>>
>
> Does this also need a change to the EXTRA_OECONF to ensure that the x11
> functionality is disabled by default in the configuration.

I didn't find this option; it'd be great so we'd ensure it wouldn't
link against host x11.
Richard Purdie - Feb. 19, 2013, 5:33 p.m.
On Tue, 2013-02-19 at 13:57 -0300, Otavio Salvador wrote:
> On Tue, Feb 19, 2013 at 1:54 PM, Saul Wold <sgw@linux.intel.com> wrote:
> > On 02/17/2013 09:53 AM, Otavio Salvador wrote:
> >>
> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> >> ---
> >>   meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 4 ++--
> >>   1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> >> b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> >> index cfc6fd8..d7ce8dc 100644
> >> --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> >> +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
> >> @@ -1,10 +1,10 @@
> >>   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
> >> ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11', '',
> >> d)} qt4-native"
> >>   SECTION = "libs"
> >>   HOMEPAGE = "http://qt.nokia.com"
> >>   LICENSE = "LGPLv2.1 | GPLv3"
> >>
> >> -INC_PR = "r13"
> >> +INC_PR = "r14"
> >>
> >>   FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
> >>
> >>
> >
> > Does this also need a change to the EXTRA_OECONF to ensure that the x11
> > functionality is disabled by default in the configuration.
> 
> I didn't find this option; it'd be great so we'd ensure it wouldn't
> link against host x11.

We need to find or patch that option in otherwise this is not a viable
change.

Cheers,

Richard
Otavio Salvador - Feb. 19, 2013, 5:37 p.m.
On Tue, Feb 19, 2013 at 2:33 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2013-02-19 at 13:57 -0300, Otavio Salvador wrote:
>> On Tue, Feb 19, 2013 at 1:54 PM, Saul Wold <sgw@linux.intel.com> wrote:
>> > On 02/17/2013 09:53 AM, Otavio Salvador wrote:
>> >>
>> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> >> ---
>> >>   meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 4 ++--
>> >>   1 file changed, 2 insertions(+), 2 deletions(-)
>> >>
>> >> diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> >> b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> >> index cfc6fd8..d7ce8dc 100644
>> >> --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> >> +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
>> >> @@ -1,10 +1,10 @@
>> >>   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
>> >> ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11', '',
>> >> d)} qt4-native"
>> >>   SECTION = "libs"
>> >>   HOMEPAGE = "http://qt.nokia.com"
>> >>   LICENSE = "LGPLv2.1 | GPLv3"
>> >>
>> >> -INC_PR = "r13"
>> >> +INC_PR = "r14"
>> >>
>> >>   FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
>> >>
>> >>
>> >
>> > Does this also need a change to the EXTRA_OECONF to ensure that the x11
>> > functionality is disabled by default in the configuration.
>>
>> I didn't find this option; it'd be great so we'd ensure it wouldn't
>> link against host x11.
>
> We need to find or patch that option in otherwise this is not a viable
> change.

Once I finish what I am doing, I will take a look once again.

Patch

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index cfc6fd8..d7ce8dc 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -1,10 +1,10 @@ 
 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 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11', '', d)} qt4-native"
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 LICENSE = "LGPLv2.1 | GPLv3"
 
-INC_PR = "r13"
+INC_PR = "r14"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"