* [PATCH v2 2/5] dbus: Drop x11 support from nativesdk
2013-02-17 17:53 [PATCH v2 1/5] perl: Add auto/XS/Typemap in perl-doc package Otavio Salvador
@ 2013-02-17 17:53 ` Otavio Salvador
2013-02-17 17:53 ` [PATCH v2 3/5] libsdl: Use 'virtual/nativesdk-libx11' instead of hardcoding nativesdk-libx11 Otavio Salvador
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2013-02-17 17:53 UTC (permalink / raw)
To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador
This avoid a libx11 dependency for nativesdk as it is not intended to
be run in the toolchain. We also remove the dbus-launch as without x11
support it might case trouble for user
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-core/dbus/dbus.inc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 292ab29..4897fd3 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
X11DEPENDS = "virtual/libx11 libsm"
DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
DEPENDS_class-native = "expat-native virtual/libintl-native"
-DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11"
+DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl"
RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}"
RDEPENDS_class-native = ""
-INC_PR = "r5"
+INC_PR = "r6"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://tmpdir.patch; \
@@ -126,5 +126,9 @@ do_install_class-native() {
do_install_class-nativesdk() {
autotools_do_install
+
+ # dbus-launch has no X support so lets not install it in case the host
+ # has a more featured and useful version
+ rm -f ${D}${bindir}/dbus-launch
}
BBCLASSEXTEND = "native nativesdk"
--
1.8.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/5] libsdl: Use 'virtual/nativesdk-libx11' instead of hardcoding nativesdk-libx11
2013-02-17 17:53 [PATCH v2 1/5] perl: Add auto/XS/Typemap in perl-doc package Otavio Salvador
2013-02-17 17:53 ` [PATCH v2 2/5] dbus: Drop x11 support from nativesdk Otavio Salvador
@ 2013-02-17 17:53 ` Otavio Salvador
2013-02-17 17:53 ` [PATCH v2 4/5] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature Otavio Salvador
2013-02-17 17:53 ` [PATCH v2 5/5] meta-toolchain-qt.inc: Use CXX when linking Otavio Salvador
3 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2013-02-17 17:53 UTC (permalink / raw)
To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index e25c597..5776617 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -16,9 +16,9 @@ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
tslib"
-DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
+DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://configure_tweak.patch \
--
1.8.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 4/5] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature
2013-02-17 17:53 [PATCH v2 1/5] perl: Add auto/XS/Typemap in perl-doc package Otavio Salvador
2013-02-17 17:53 ` [PATCH v2 2/5] dbus: Drop x11 support from nativesdk Otavio Salvador
2013-02-17 17:53 ` [PATCH v2 3/5] libsdl: Use 'virtual/nativesdk-libx11' instead of hardcoding nativesdk-libx11 Otavio Salvador
@ 2013-02-17 17:53 ` Otavio Salvador
2013-02-19 16:54 ` Saul Wold
2013-02-17 17:53 ` [PATCH v2 5/5] meta-toolchain-qt.inc: Use CXX when linking Otavio Salvador
3 siblings, 1 reply; 9+ messages in thread
From: Otavio Salvador @ 2013-02-17 17:53 UTC (permalink / raw)
To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador
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}:"
--
1.8.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 4/5] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature
2013-02-17 17:53 ` [PATCH v2 4/5] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature Otavio Salvador
@ 2013-02-19 16:54 ` Saul Wold
2013-02-19 16:57 ` Otavio Salvador
0 siblings, 1 reply; 9+ messages in thread
From: Saul Wold @ 2013-02-19 16:54 UTC (permalink / raw)
To: Otavio Salvador; +Cc: OpenEmbedded Core Mailing List
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!
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 4/5] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature
2013-02-19 16:54 ` Saul Wold
@ 2013-02-19 16:57 ` Otavio Salvador
2013-02-19 17:33 ` Richard Purdie
0 siblings, 1 reply; 9+ messages in thread
From: Otavio Salvador @ 2013-02-19 16:57 UTC (permalink / raw)
To: Saul Wold; +Cc: OpenEmbedded Core Mailing List
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.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 4/5] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature
2013-02-19 16:57 ` Otavio Salvador
@ 2013-02-19 17:33 ` Richard Purdie
2013-02-19 17:37 ` Otavio Salvador
0 siblings, 1 reply; 9+ messages in thread
From: Richard Purdie @ 2013-02-19 17:33 UTC (permalink / raw)
To: Otavio Salvador; +Cc: OpenEmbedded Core Mailing List
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 4/5] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature
2013-02-19 17:33 ` Richard Purdie
@ 2013-02-19 17:37 ` Otavio Salvador
0 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2013-02-19 17:37 UTC (permalink / raw)
To: Richard Purdie; +Cc: OpenEmbedded Core Mailing List
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.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 5/5] meta-toolchain-qt.inc: Use CXX when linking
2013-02-17 17:53 [PATCH v2 1/5] perl: Add auto/XS/Typemap in perl-doc package Otavio Salvador
` (2 preceding siblings ...)
2013-02-17 17:53 ` [PATCH v2 4/5] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature Otavio Salvador
@ 2013-02-17 17:53 ` Otavio Salvador
3 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2013-02-17 17:53 UTC (permalink / raw)
To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador
We should use CXX compiler when linking objects as done in regular
builds inside of OE-Core. This fixes issues we've been seeing in field
where we needed to change it byhand so the toolchain could work.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-qt/meta/meta-toolchain-qt.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/meta/recipes-qt/meta/meta-toolchain-qt.inc
index 107ba19..abf12fb 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qt.inc
+++ b/meta/recipes-qt/meta/meta-toolchain-qt.inc
@@ -12,7 +12,7 @@ toolchain_create_sdk_env_script_append() {
echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
echo 'export OE_QMAKE_CC=$CC' >> $script
echo 'export OE_QMAKE_CXX=$CXX' >> $script
- echo 'export OE_QMAKE_LINK=$LD' >> $script
+ echo 'export OE_QMAKE_LINK=$CXX' >> $script
echo 'export OE_QMAKE_AR=$AR' >> $script
echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script
echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script
--
1.8.1
^ permalink raw reply related [flat|nested] 9+ messages in thread