All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] qt4-libs-native: add initial recipe
@ 2011-05-07 13:07 Simon Busch
  2011-05-07 19:17 ` Otavio Salvador
  0 siblings, 1 reply; 15+ messages in thread
From: Simon Busch @ 2011-05-07 13:07 UTC (permalink / raw)
  To: openembedded-devel

The native version of the qt4 libraries is needed by some other native recipes to build.
It's mostly a copy of the qt4-tools-native recipes with some changed configuration optons
and is only available for version 4.7.2 now.

Signed-off-by: Simon Busch <morphis@gravedo.de>
---
 recipes/qt4/qt4-libs-native.inc      |   67 ++++++++++++++++++++++++++++++++++
 recipes/qt4/qt4-libs-native_4.7.2.bb |   19 ++++++++++
 2 files changed, 86 insertions(+), 0 deletions(-)
 create mode 100644 recipes/qt4/qt4-libs-native.inc
 create mode 100644 recipes/qt4/qt4-libs-native_4.7.2.bb

diff --git a/recipes/qt4/qt4-libs-native.inc b/recipes/qt4/qt4-libs-native.inc
new file mode 100644
index 0000000..7d2116a
--- /dev/null
+++ b/recipes/qt4/qt4-libs-native.inc
@@ -0,0 +1,67 @@
+DESCRIPTION = "Native libraries for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "zlib-native dbus-native"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+INC_PR = "r0"
+
+inherit native
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf"
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+EXTRA_OECONF = "-prefix ${prefix} \
+                -L ${STAGING_LIBDIR_NATIVE} \
+                -I ${STAGING_INCDIR_NATIVE} \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-libjpeg -no-libpng -no-libmng -no-libtiff \
+                -no-accessibility \
+                -no-cups \
+                -no-nas-sound \
+                -no-nis -no-openssl \
+                -verbose -release \
+                -embedded -no-freetype -no-glib -no-iconv \
+                -exceptions -xmlpatterns \
+                -qt3support"
+
+# yank default -e, otherwise we get the following error:
+# moc_qbuffer.cpp: No such file or directory
+EXTRA_OEMAKE = " "
+
+do_configure() {
+   (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+  src/tools/moc \
+  src/corelib \
+  src/sql \
+  src/xml \
+  src/network \
+  src/tools/uic \
+  src/tools/rcc \
+  src/xmlpatterns \
+  src/dbus \
+  src/gui \
+  src/testlib \
+  src/qt3support \
+"
+
+do_compile() {
+    for i in ${TOBUILD}; do
+        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+    done
+}
+
+NATIVE_INSTALL_WORKS = "1"
+
+do_install() {
+    for i in ${TOBUILD}; do
+        cd ${S}/$i && oe_runmake install INSTALL_ROOT=${D}
+    done
+}
diff --git a/recipes/qt4/qt4-libs-native_4.7.2.bb b/recipes/qt4/qt4-libs-native_4.7.2.bb
new file mode 100644
index 0000000..23c5632
--- /dev/null
+++ b/recipes/qt4/qt4-libs-native_4.7.2.bb
@@ -0,0 +1,19 @@
+require qt4-libs-native.inc
+LICENSE = "LGPLv2.1 GPLv3"
+
+PR = "${INC_PR}.0"
+
+# Find the g++.conf/linux.conf in the right directory.
+FILESPATHPKG =. "qt-${PV}:"
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf"
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+EXTRA_OECONF += " -no-fast -silent -no-rpath"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
-- 
1.7.4.1




^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH] qt4-libs-native: add initial recipe
  2011-05-07 13:07 [PATCH] qt4-libs-native: add initial recipe Simon Busch
@ 2011-05-07 19:17 ` Otavio Salvador
  2011-05-08 12:28   ` Simon Busch
  0 siblings, 1 reply; 15+ messages in thread
From: Otavio Salvador @ 2011-05-07 19:17 UTC (permalink / raw)
  To: openembedded-devel

On Sat, May 7, 2011 at 10:07, Simon Busch <morphis@gravedo.de> wrote:
> The native version of the qt4 libraries is needed by some other native recipes to build.
> It's mostly a copy of the qt4-tools-native recipes with some changed configuration optons
> and is only available for version 4.7.2 now.

I second this idea since I will be a user of it but seems better to me
to have a full qt4-native since this would reduce build duplication
time, no?

-- 
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] 15+ messages in thread

* Re: [PATCH] qt4-libs-native: add initial recipe
  2011-05-07 19:17 ` Otavio Salvador
@ 2011-05-08 12:28   ` Simon Busch
  2011-05-08 16:33     ` Otavio Salvador
  0 siblings, 1 reply; 15+ messages in thread
From: Simon Busch @ 2011-05-08 12:28 UTC (permalink / raw)
  To: openembedded-devel

On 07.05.2011 21:17, Otavio Salvador wrote:
> On Sat, May 7, 2011 at 10:07, Simon Busch <morphis@gravedo.de> wrote:
>> The native version of the qt4 libraries is needed by some other native recipes to build.
>> It's mostly a copy of the qt4-tools-native recipes with some changed configuration optons
>> and is only available for version 4.7.2 now.
> 
> I second this idea since I will be a user of it but seems better to me
> to have a full qt4-native since this would reduce build duplication
> time, no?

You are right. As qt4-libs-native and qt4-tools-native are build mostly
the same stuff we could merge them and create a qt4-native recipe if
nobody else has any concerns. I will provide a patch for this.

regards,
Simon






^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH] qt4-libs-native: add initial recipe
  2011-05-08 12:28   ` Simon Busch
@ 2011-05-08 16:33     ` Otavio Salvador
  2011-05-08 16:51       ` Simon Busch
  0 siblings, 1 reply; 15+ messages in thread
From: Otavio Salvador @ 2011-05-08 16:33 UTC (permalink / raw)
  To: openembedded-devel

On Sun, May 8, 2011 at 09:28, Simon Busch <morphis@gravedo.de> wrote:
> On 07.05.2011 21:17, Otavio Salvador wrote:
>> On Sat, May 7, 2011 at 10:07, Simon Busch <morphis@gravedo.de> wrote:
>>> The native version of the qt4 libraries is needed by some other native recipes to build.
>>> It's mostly a copy of the qt4-tools-native recipes with some changed configuration optons
>>> and is only available for version 4.7.2 now.
>>
>> I second this idea since I will be a user of it but seems better to me
>> to have a full qt4-native since this would reduce build duplication
>> time, no?
>
> You are right. As qt4-libs-native and qt4-tools-native are build mostly
> the same stuff we could merge them and create a qt4-native recipe if
> nobody else has any concerns. I will provide a patch for this.

IMO you might try to make it on qt4-x11-free recipe and add a provides
for the tools.

-- 
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] 15+ messages in thread

* Re: [PATCH] qt4-libs-native: add initial recipe
  2011-05-08 16:33     ` Otavio Salvador
@ 2011-05-08 16:51       ` Simon Busch
  2011-05-08 16:55         ` [PATCH] qt4-native: introduce the native version of qt4 Simon Busch
  2011-05-08 16:59         ` [PATCH] qt4-libs-native: add initial recipe Otavio Salvador
  0 siblings, 2 replies; 15+ messages in thread
From: Simon Busch @ 2011-05-08 16:51 UTC (permalink / raw)
  To: openembedded-devel

On 08.05.2011 18:33, Otavio Salvador wrote:
> On Sun, May 8, 2011 at 09:28, Simon Busch <morphis@gravedo.de> wrote:
>> On 07.05.2011 21:17, Otavio Salvador wrote:
>>> On Sat, May 7, 2011 at 10:07, Simon Busch <morphis@gravedo.de> wrote:
>>>> The native version of the qt4 libraries is needed by some other native recipes to build.
>>>> It's mostly a copy of the qt4-tools-native recipes with some changed configuration optons
>>>> and is only available for version 4.7.2 now.
>>>
>>> I second this idea since I will be a user of it but seems better to me
>>> to have a full qt4-native since this would reduce build duplication
>>> time, no?
>>
>> You are right. As qt4-libs-native and qt4-tools-native are build mostly
>> the same stuff we could merge them and create a qt4-native recipe if
>> nobody else has any concerns. I will provide a patch for this.
> 
> IMO you might try to make it on qt4-x11-free recipe and add a provides
> for the tools.

Hm, I need it for the embedded variant of qt4 so we should add it to
qt4.inc which is already quite complex and very target specific. I think
the best option is to create a qt4-native recipe which provides both
qt4-tools-native and qt4-libs-native. This would even be the best option
to be backward compatible (some stuff in OE is depending on
qt4-native-tools in different versions).

regards,
Simon



^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH] qt4-native: introduce the native version of qt4
  2011-05-08 16:51       ` Simon Busch
@ 2011-05-08 16:55         ` Simon Busch
  2011-05-08 17:18           ` Otavio Salvador
  2011-05-08 16:59         ` [PATCH] qt4-libs-native: add initial recipe Otavio Salvador
  1 sibling, 1 reply; 15+ messages in thread
From: Simon Busch @ 2011-05-08 16:55 UTC (permalink / raw)
  To: openembedded-devel

The new recipe is based on the qt4-tool-native one but it even installs the libraries of
qt4 and not only the tools like moc/rcc. It will not increase the build time as most
libraries are already build for the qt4-tool-native but not staged.

Signed-off-by: Simon Busch <morphis@gravedo.de>
---
 recipes/qt4/qt4-native.inc      |   68 +++++++++++++++++++++++++++++++++++++++
 recipes/qt4/qt4-native_4.7.2.bb |   19 +++++++++++
 2 files changed, 87 insertions(+), 0 deletions(-)
 create mode 100644 recipes/qt4/qt4-native.inc
 create mode 100644 recipes/qt4/qt4-native_4.7.2.bb

diff --git a/recipes/qt4/qt4-native.inc b/recipes/qt4/qt4-native.inc
new file mode 100644
index 0000000..ee702e9
--- /dev/null
+++ b/recipes/qt4/qt4-native.inc
@@ -0,0 +1,68 @@
+DESCRIPTION = "Native version Qt/[X11|Mac|Embedded]"
+DEPENDS = "zlib-native dbus-native"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PROVIDES = "qt4-tools-native"
+
+INC_PR = "r0"
+
+inherit native
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf"
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+EXTRA_OECONF = "-prefix ${prefix} \
+                -L ${STAGING_LIBDIR_NATIVE} \
+                -I ${STAGING_INCDIR_NATIVE} \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-libjpeg -no-libpng -no-libmng -no-libtiff \
+                -no-accessibility \
+                -no-cups \
+                -no-nas-sound \
+                -no-nis -no-openssl \
+                -verbose -release \
+                -embedded -no-freetype -no-glib -no-iconv \
+                -exceptions -xmlpatterns \
+                -qt3support"
+
+# yank default -e, otherwise we get the following error:
+# moc_qbuffer.cpp: No such file or directory
+EXTRA_OEMAKE = " "
+
+do_configure() {
+   (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+  src/tools/moc \
+  src/corelib \
+  src/sql \
+  src/xml \
+  src/network \
+  src/tools/uic \
+  src/tools/rcc \
+  src/xmlpatterns \
+  src/dbus \
+  src/gui \
+  src/testlib \
+  src/qt3support \
+"
+
+do_compile() {
+    for i in ${TOBUILD}; do
+        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+    done
+}
+
+NATIVE_INSTALL_WORKS = "1"
+
+do_install() {
+    for i in ${TOBUILD}; do
+        cd ${S}/$i && oe_runmake install INSTALL_ROOT=${D}
+    done
+}
diff --git a/recipes/qt4/qt4-native_4.7.2.bb b/recipes/qt4/qt4-native_4.7.2.bb
new file mode 100644
index 0000000..7e98035
--- /dev/null
+++ b/recipes/qt4/qt4-native_4.7.2.bb
@@ -0,0 +1,19 @@
+require qt4-native.inc
+LICENSE = "LGPLv2.1 GPLv3"
+
+PR = "${INC_PR}.0"
+
+# Find the g++.conf/linux.conf in the right directory.
+FILESPATHPKG =. "qt-${PV}:"
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf"
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+EXTRA_OECONF += " -no-fast -silent -no-rpath"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
-- 
1.7.4.1




^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH] qt4-libs-native: add initial recipe
  2011-05-08 16:51       ` Simon Busch
  2011-05-08 16:55         ` [PATCH] qt4-native: introduce the native version of qt4 Simon Busch
@ 2011-05-08 16:59         ` Otavio Salvador
  2011-05-08 17:14           ` Simon Busch
  1 sibling, 1 reply; 15+ messages in thread
From: Otavio Salvador @ 2011-05-08 16:59 UTC (permalink / raw)
  To: openembedded-devel

On Sun, May 8, 2011 at 13:51, Simon Busch <morphis@gravedo.de> wrote:
...
> Hm, I need it for the embedded variant of qt4 so we should add it to
> qt4.inc which is already quite complex and very target specific. I think
> the best option is to create a qt4-native recipe which provides both
> qt4-tools-native and qt4-libs-native. This would even be the best option
> to be backward compatible (some stuff in OE is depending on
> qt4-native-tools in different versions).

The native variant does need to be the embedded one for you? I think
you just needed it to run something that uses QtCore or something
similar during the build process (my case) and then build it for the
target.

-- 
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] 15+ messages in thread

* Re: [PATCH] qt4-libs-native: add initial recipe
  2011-05-08 16:59         ` [PATCH] qt4-libs-native: add initial recipe Otavio Salvador
@ 2011-05-08 17:14           ` Simon Busch
  0 siblings, 0 replies; 15+ messages in thread
From: Simon Busch @ 2011-05-08 17:14 UTC (permalink / raw)
  To: openembedded-devel

On 08.05.2011 18:59, Otavio Salvador wrote:
> On Sun, May 8, 2011 at 13:51, Simon Busch <morphis@gravedo.de> wrote:
> ...
>> Hm, I need it for the embedded variant of qt4 so we should add it to
>> qt4.inc which is already quite complex and very target specific. I think
>> the best option is to create a qt4-native recipe which provides both
>> qt4-tools-native and qt4-libs-native. This would even be the best option
>> to be backward compatible (some stuff in OE is depending on
>> qt4-native-tools in different versions).
> 
> The native variant does need to be the embedded one for you? I think
> you just needed it to run something that uses QtCore or something
> similar during the build process (my case) and then build it for the
> target.

No, the native variant should be build from the qt4 anywhere package as
it's already the case for the qt4-tools-native. My qt4-native recipe
does this too. It builds only the needed tools and libraries and
installs them to the sysroot. Currently it builds:

- src/tools/moc
- src/corelib
- src/xml
- src/network
- src/tools/uic
- src/tools/rcc
- src/xmlpatterns
- src/testlib
- src/qt3support

If some other libs/tools are needed for any other native tool we should
add it to the list above.

And yes, you are right my recipes which need the qt4-native one only
needs the Qt4 core libs (as it should be the case for most native stuff
which uses qt4).

regards,
Simon



^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH] qt4-native: introduce the native version of qt4
  2011-05-08 16:55         ` [PATCH] qt4-native: introduce the native version of qt4 Simon Busch
@ 2011-05-08 17:18           ` Otavio Salvador
  2011-05-08 17:48             ` Simon Busch
  0 siblings, 1 reply; 15+ messages in thread
From: Otavio Salvador @ 2011-05-08 17:18 UTC (permalink / raw)
  To: openembedded-devel

On Sun, May 8, 2011 at 13:55, Simon Busch <morphis@gravedo.de> wrote:
> The new recipe is based on the qt4-tool-native one but it even installs the libraries of
> qt4 and not only the tools like moc/rcc. It will not increase the build time as most
> libraries are already build for the qt4-tool-native but not staged.

Please remove the tools recipe too.

-- 
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] 15+ messages in thread

* Re: [PATCH] qt4-native: introduce the native version of qt4
  2011-05-08 17:18           ` Otavio Salvador
@ 2011-05-08 17:48             ` Simon Busch
  2011-05-08 17:54               ` Otavio Salvador
  0 siblings, 1 reply; 15+ messages in thread
From: Simon Busch @ 2011-05-08 17:48 UTC (permalink / raw)
  To: openembedded-devel

On 08.05.2011 19:18, Otavio Salvador wrote:
> Please remove the tools recipe too.

Yes, I will provide a patch for this too. But first I want to know if
you are fine with this patch?



^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH] qt4-native: introduce the native version of qt4
  2011-05-08 17:48             ` Simon Busch
@ 2011-05-08 17:54               ` Otavio Salvador
  2011-05-08 18:01                 ` Simon Busch
  0 siblings, 1 reply; 15+ messages in thread
From: Otavio Salvador @ 2011-05-08 17:54 UTC (permalink / raw)
  To: openembedded-devel

On Sun, May 8, 2011 at 14:48, Simon Busch <morphis@gravedo.de> wrote:
> On 08.05.2011 19:18, Otavio Salvador wrote:
>> Please remove the tools recipe too.
>
> Yes, I will provide a patch for this too. But first I want to know if
> you are fine with this patch?

For me it seems fine however I'd prefer if you drop the tools one at
same commit so it is easier to revert if required.

BTW, it would be nice if you could do the same for oe-core :-)

-- 
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] 15+ messages in thread

* Re: [PATCH] qt4-native: introduce the native version of qt4
  2011-05-08 17:54               ` Otavio Salvador
@ 2011-05-08 18:01                 ` Simon Busch
  2011-05-08 18:05                   ` Otavio Salvador
  2011-05-08 20:13                   ` [PATCH] qt4-native: introduce the native version of qt4 and remove old qt4-tools-native Simon Busch
  0 siblings, 2 replies; 15+ messages in thread
From: Simon Busch @ 2011-05-08 18:01 UTC (permalink / raw)
  To: openembedded-devel

On 08.05.2011 19:54, Otavio Salvador wrote:
> On Sun, May 8, 2011 at 14:48, Simon Busch <morphis@gravedo.de> wrote:
>> On 08.05.2011 19:18, Otavio Salvador wrote:
>>> Please remove the tools recipe too.
>>
>> Yes, I will provide a patch for this too. But first I want to know if
>> you are fine with this patch?
> 
> For me it seems fine however I'd prefer if you drop the tools one at
> same commit so it is easier to revert if required.

Ok, I will send a patch which does both, adding the new and removing the
old recipe. I will even provided all versions of qt4 supported by
qt4-tools-native.

> BTW, it would be nice if you could do the same for oe-core :-)

I can but I have to setup the environment first to test everything. So
this will need some time.

regards,
Simon




^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH] qt4-native: introduce the native version of qt4
  2011-05-08 18:01                 ` Simon Busch
@ 2011-05-08 18:05                   ` Otavio Salvador
  2011-05-08 20:13                   ` [PATCH] qt4-native: introduce the native version of qt4 and remove old qt4-tools-native Simon Busch
  1 sibling, 0 replies; 15+ messages in thread
From: Otavio Salvador @ 2011-05-08 18:05 UTC (permalink / raw)
  To: openembedded-devel

On Sun, May 8, 2011 at 15:01, Simon Busch <morphis@gravedo.de> wrote:
...
>> BTW, it would be nice if you could do the same for oe-core :-)
>
> I can but I have to setup the environment first to test everything. So
> this will need some time.

That would be nice to avoid more missing stuff between both.

I am just porting your rpath and my qt fixes for cmake and avoiding
divertion when possible seems the better.

-- 
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] 15+ messages in thread

* [PATCH] qt4-native: introduce the native version of qt4 and remove old qt4-tools-native
  2011-05-08 18:01                 ` Simon Busch
  2011-05-08 18:05                   ` Otavio Salvador
@ 2011-05-08 20:13                   ` Simon Busch
  2011-05-09  1:35                     ` Otavio Salvador
  1 sibling, 1 reply; 15+ messages in thread
From: Simon Busch @ 2011-05-08 20:13 UTC (permalink / raw)
  To: openembedded-devel

The new recipe is based on the qt4-tool-native one but it even installs the libraries of
qt4 and not only the tools like moc/rcc. It will not increase the build time as most
libraries are already build for the qt4-tool-native but not staged.

This commit removes the old qt4-tools-native too. All versions provided by
qt4-tools-native are even supported by qt4-native so it is a drop-in replacement.

Signed-off-by: Simon Busch <morphis@gravedo.de>
---
 recipes/qt4/qt4-native.inc            |   65 +++++++++++++++++++++++++++
 recipes/qt4/qt4-native_4.5.2.bb       |   24 ++++++++++
 recipes/qt4/qt4-native_4.6.3.bb       |   13 +++++
 recipes/qt4/qt4-native_4.7.2.bb       |   19 ++++++++
 recipes/qt4/qt4-tools-native.inc      |   78 ---------------------------------
 recipes/qt4/qt4-tools-native_4.5.2.bb |   24 ----------
 recipes/qt4/qt4-tools-native_4.6.3.bb |   13 -----
 recipes/qt4/qt4-tools-native_4.7.2.bb |   21 ---------
 8 files changed, 121 insertions(+), 136 deletions(-)
 create mode 100644 recipes/qt4/qt4-native.inc
 create mode 100644 recipes/qt4/qt4-native_4.5.2.bb
 create mode 100644 recipes/qt4/qt4-native_4.6.3.bb
 create mode 100644 recipes/qt4/qt4-native_4.7.2.bb
 delete mode 100644 recipes/qt4/qt4-tools-native.inc
 delete mode 100644 recipes/qt4/qt4-tools-native_4.5.2.bb
 delete mode 100644 recipes/qt4/qt4-tools-native_4.6.3.bb
 delete mode 100644 recipes/qt4/qt4-tools-native_4.7.2.bb

diff --git a/recipes/qt4/qt4-native.inc b/recipes/qt4/qt4-native.inc
new file mode 100644
index 0000000..8039ff1
--- /dev/null
+++ b/recipes/qt4/qt4-native.inc
@@ -0,0 +1,65 @@
+DESCRIPTION = "Native version Qt/[X11|Mac|Embedded]"
+DEPENDS = "zlib-native dbus-native"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PROVIDES = "qt4-tools-native"
+
+INC_PR = "r0"
+
+inherit native
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf"
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+EXTRA_OECONF = "-prefix ${prefix} \
+                -L ${STAGING_LIBDIR_NATIVE} \
+                -I ${STAGING_INCDIR_NATIVE} \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-libjpeg -no-libpng -no-libmng -no-libtiff \
+                -no-accessibility \
+                -no-cups \
+                -no-nas-sound \
+                -no-nis -no-openssl \
+                -verbose -release \
+                -embedded -no-freetype -no-glib -no-iconv \
+                -exceptions -xmlpatterns \
+                -qt3support"
+
+# yank default -e, otherwise we get the following error:
+# moc_qbuffer.cpp: No such file or directory
+EXTRA_OEMAKE = " "
+
+do_configure() {
+   (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+  src/tools/moc \
+  src/corelib \
+  src/xml \
+  src/network \
+  src/tools/uic \
+  src/tools/rcc \
+  src/xmlpatterns \
+  src/testlib \
+  src/qt3support \
+"
+
+do_compile() {
+    for i in ${TOBUILD}; do
+        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+    done
+}
+
+NATIVE_INSTALL_WORKS = "1"
+
+do_install() {
+    for i in ${TOBUILD}; do
+        cd ${S}/$i && oe_runmake install INSTALL_ROOT=${D}
+    done
+}
diff --git a/recipes/qt4/qt4-native_4.5.2.bb b/recipes/qt4/qt4-native_4.5.2.bb
new file mode 100644
index 0000000..8a94694
--- /dev/null
+++ b/recipes/qt4/qt4-native_4.5.2.bb
@@ -0,0 +1,24 @@
+require qt4-native.inc
+
+# Older releases have different source archive name, than .inc
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+           file://configure-lflags.patch \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf"
+
+S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+
+EXTRA_OECONF += " -fast -qt-freetype"
+
+do_configure() {
+   (echo o; echo yes) | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+LICENSE = "LGPLv2.1 GPLv3"
+PR = "${INC_PR}.2"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "62186345c609a72b89f16d83bc7a130f"
+SRC_URI[sha256sum] = "272301a27e2f7bcd44c8d09f496e1c749c80b86d9489ea9c30bb265bf2dd02fc"
diff --git a/recipes/qt4/qt4-native_4.6.3.bb b/recipes/qt4/qt4-native_4.6.3.bb
new file mode 100644
index 0000000..b0c9bcb
--- /dev/null
+++ b/recipes/qt4/qt4-native_4.6.3.bb
@@ -0,0 +1,13 @@
+DEFAULT_PREFERENCE = "-1"
+
+require qt4-native.inc
+LICENSE = "LGPLv2.1 GPLv3"
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += " -no-fast -silent -no-rpath"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
+SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
+
diff --git a/recipes/qt4/qt4-native_4.7.2.bb b/recipes/qt4/qt4-native_4.7.2.bb
new file mode 100644
index 0000000..7e98035
--- /dev/null
+++ b/recipes/qt4/qt4-native_4.7.2.bb
@@ -0,0 +1,19 @@
+require qt4-native.inc
+LICENSE = "LGPLv2.1 GPLv3"
+
+PR = "${INC_PR}.0"
+
+# Find the g++.conf/linux.conf in the right directory.
+FILESPATHPKG =. "qt-${PV}:"
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf"
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+EXTRA_OECONF += " -no-fast -silent -no-rpath"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
deleted file mode 100644
index 4a0ccce..0000000
--- a/recipes/qt4/qt4-tools-native.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "zlib-native dbus-native"
-SECTION = "libs"
-HOMEPAGE = "http://www.trolltech.com"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-INC_PR = "r10"
-
-inherit native
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://qt-config.patch \
-           file://g++.conf \
-           file://linux.conf"
-S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
-
-EXTRA_OECONF = "-prefix ${prefix} \
-                -L ${STAGING_LIBDIR_NATIVE} \
-                -I ${STAGING_INCDIR_NATIVE} \
-                -qt-libjpeg -qt-gif -system-zlib \
-                -no-libjpeg -no-libpng -no-libmng -no-libtiff \
-                -no-accessibility \
-                -no-cups \
-                -no-exceptions  \
-                -no-nas-sound \
-                -no-nis -no-openssl \
-                -verbose -release -static \
-                -embedded -no-freetype -no-glib -no-iconv \
-                -qt3support"
-
-# yank default -e, otherwise we get the following error:
-# moc_qbuffer.cpp: No such file or directory
-EXTRA_OEMAKE = " "
-
-do_configure() {
-   (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-TOBUILD = "\
-  src/tools/moc \
-  src/corelib \
-  src/sql \
-  src/dbus \
-  src/qt3support \
-  src/xml \
-  src/tools/uic \
-  src/tools/rcc \
-  src/network \
-  src/gui \
-  src/tools/uic3 \
-  tools/linguist/lrelease \
-  tools/linguist/lupdate \
-  tools/qdbus \
-"
-
-do_compile() {
-    for i in ${TOBUILD}; do
-        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
-    done
-}
-
-NATIVE_INSTALL_WORKS = "1"
-
-do_install() {
-    install -d ${D}${bindir}/
-    install -m 0755 bin/qmake ${D}${bindir}/qmake2
-    for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
-        install -m 0755 bin/${i} ${D}${bindir}/${i}4
-    done
-    
-    install -d ${D}${datadir}/qt4/
-    cp -PfR mkspecs ${D}${datadir}/qt4/
-    ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++
-    cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/
-
-    install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
-}
diff --git a/recipes/qt4/qt4-tools-native_4.5.2.bb b/recipes/qt4/qt4-tools-native_4.5.2.bb
deleted file mode 100644
index 206e486..0000000
--- a/recipes/qt4/qt4-tools-native_4.5.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require qt4-tools-native.inc
-
-# Older releases have different source archive name, than .inc
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://configure-lflags.patch \
-           file://qt-config.patch \
-           file://g++.conf \
-           file://linux.conf"
-
-S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
-
-EXTRA_OECONF += " -fast -qt-freetype"
-
-do_configure() {
-   (echo o; echo yes) | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-LICENSE = "LGPLv2.1 GPLv3"
-PR = "${INC_PR}.2"
-
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-
-SRC_URI[md5sum] = "62186345c609a72b89f16d83bc7a130f"
-SRC_URI[sha256sum] = "272301a27e2f7bcd44c8d09f496e1c749c80b86d9489ea9c30bb265bf2dd02fc"
diff --git a/recipes/qt4/qt4-tools-native_4.6.3.bb b/recipes/qt4/qt4-tools-native_4.6.3.bb
deleted file mode 100644
index a188157..0000000
--- a/recipes/qt4/qt4-tools-native_4.6.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-require qt4-tools-native.inc
-LICENSE = "LGPLv2.1 GPLv3"
-PR = "${INC_PR}.0"
-
-EXTRA_OECONF += " -no-fast -silent -no-rpath"
-
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-
-SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
-SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
-
diff --git a/recipes/qt4/qt4-tools-native_4.7.2.bb b/recipes/qt4/qt4-tools-native_4.7.2.bb
deleted file mode 100644
index 7dbb569..0000000
--- a/recipes/qt4/qt4-tools-native_4.7.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-require qt4-tools-native.inc
-LICENSE = "LGPLv2.1 GPLv3"
-
-PR = "${INC_PR}.0"
-
-# Find the g++.conf/linux.conf in the right directory.
-FILESPATHPKG =. "qt-${PV}:"
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://qt-config.patch \
-           file://g++.conf \
-           file://linux.conf"
-S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
-
-EXTRA_OECONF += " -no-fast -silent -no-rpath"
-
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
-- 
1.7.4.1




^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH] qt4-native: introduce the native version of qt4 and remove old qt4-tools-native
  2011-05-08 20:13                   ` [PATCH] qt4-native: introduce the native version of qt4 and remove old qt4-tools-native Simon Busch
@ 2011-05-09  1:35                     ` Otavio Salvador
  0 siblings, 0 replies; 15+ messages in thread
From: Otavio Salvador @ 2011-05-09  1:35 UTC (permalink / raw)
  To: openembedded-devel

On Sun, May 8, 2011 at 17:13, Simon Busch <morphis@gravedo.de> wrote:
> Signed-off-by: Simon Busch <morphis@gravedo.de>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
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] 15+ messages in thread

end of thread, other threads:[~2011-05-09  1:38 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-07 13:07 [PATCH] qt4-libs-native: add initial recipe Simon Busch
2011-05-07 19:17 ` Otavio Salvador
2011-05-08 12:28   ` Simon Busch
2011-05-08 16:33     ` Otavio Salvador
2011-05-08 16:51       ` Simon Busch
2011-05-08 16:55         ` [PATCH] qt4-native: introduce the native version of qt4 Simon Busch
2011-05-08 17:18           ` Otavio Salvador
2011-05-08 17:48             ` Simon Busch
2011-05-08 17:54               ` Otavio Salvador
2011-05-08 18:01                 ` Simon Busch
2011-05-08 18:05                   ` Otavio Salvador
2011-05-08 20:13                   ` [PATCH] qt4-native: introduce the native version of qt4 and remove old qt4-tools-native Simon Busch
2011-05-09  1:35                     ` Otavio Salvador
2011-05-08 16:59         ` [PATCH] qt4-libs-native: add initial recipe Otavio Salvador
2011-05-08 17:14           ` Simon Busch

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.