* Re: [oe-commits] Koen Kooi : qt4: add 4.6.2
[not found] <E1Nhfko-0005L8-Mc@melo.openembedded.org>
@ 2010-02-17 10:48 ` Martin Jansa
2010-02-17 11:32 ` Koen Kooi
0 siblings, 1 reply; 7+ messages in thread
From: Martin Jansa @ 2010-02-17 10:48 UTC (permalink / raw)
To: openembedded-devel; +Cc: openembedded-commits
[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]
On Wed, Feb 17, 2010 at 08:59:30AM +0000, git version control wrote:
> Module: openembedded.git
> Branch: org.openembedded.dev
> Commit: fba63ed00f92f939529bd1fd1f47a8d715f8bea8
> URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fba63ed00f92f939529bd1fd1f47a8d715f8bea8
>
> Author: Koen Kooi <koen@openembedded.org>
> Date: Tue Feb 16 10:47:02 2010 +0100
>
> qt4: add 4.6.2
>
> * fix 4.6.1 references in 4.6.0 files as well
> * make qt-config.patch work with QT_NO_CAST_{TO,FROM},ASCII strict checking
No idea if that's new issue with 4.6.2 or because of my chroot, but now
it cannot find any headers from staging.
I found that now there is LFLAGS (not LDFLAGS) set with libdir and patched
configure to use that too somehow, maybe it was needed before -I -L parameters
added to configure script itself?
Attached patch works for me.. but if it's right way, then it should be
integrated to .inc files instead.
Regards,
--
uin:136542059 jid:Martin.Jansa@gmail.com
Jansa Martin sip:jamasip@voip.wengo.fr
JaMa
[-- Attachment #2: 0001-qt4-tools-native-use-I-and-L-to-specify-staging-dire.patch --]
[-- Type: text/plain, Size: 999 bytes --]
From d86a53dc732810f3a0ed93664cb1bad03177bdb4 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 17 Feb 2010 11:39:34 +0100
Subject: [PATCH] qt4-tools-native: use -I and -L to specify staging directories
---
recipes/qt4/qt4-tools-native_4.6.2.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/recipes/qt4/qt4-tools-native_4.6.2.bb b/recipes/qt4/qt4-tools-native_4.6.2.bb
index d9ab033..c40738b 100644
--- a/recipes/qt4/qt4-tools-native_4.6.2.bb
+++ b/recipes/qt4/qt4-tools-native_4.6.2.bb
@@ -13,6 +13,8 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.
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-accessibility \
--
1.7.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: Koen Kooi : qt4: add 4.6.2
2010-02-17 10:48 ` [oe-commits] Koen Kooi : qt4: add 4.6.2 Martin Jansa
@ 2010-02-17 11:32 ` Koen Kooi
2010-02-17 19:46 ` Holger Hans Peter Freyther
0 siblings, 1 reply; 7+ messages in thread
From: Koen Kooi @ 2010-02-17 11:32 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 17-02-10 11:48, Martin Jansa wrote:
> On Wed, Feb 17, 2010 at 08:59:30AM +0000, git version control wrote:
>> Module: openembedded.git
>> Branch: org.openembedded.dev
>> Commit: fba63ed00f92f939529bd1fd1f47a8d715f8bea8
>> URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fba63ed00f92f939529bd1fd1f47a8d715f8bea8
>>
>> Author: Koen Kooi <koen@openembedded.org>
>> Date: Tue Feb 16 10:47:02 2010 +0100
>>
>> qt4: add 4.6.2
>>
>> * fix 4.6.1 references in 4.6.0 files as well
>> * make qt-config.patch work with QT_NO_CAST_{TO,FROM},ASCII strict checking
>
> No idea if that's new issue with 4.6.2 or because of my chroot, but now
> it cannot find any headers from staging.
>
> I found that now there is LFLAGS (not LDFLAGS) set with libdir and patched
> configure to use that too somehow, maybe it was needed before -I -L parameters
> added to configure script itself?
>
> Attached patch works for me.. but if it's right way, then it should be
> integrated to .inc files instead.
Your patch looks good to me, but I'd like zecke to comment on it. Holger?
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFLe9PEMkyGM64RGpERAhbFAKC8HifwgYdkMUpOv6TXP7D7eYIVRQCeOaNa
6By5WnmUN4jfJHWrUW0QEGA=
=xKIN
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Koen Kooi : qt4: add 4.6.2
2010-02-17 11:32 ` Koen Kooi
@ 2010-02-17 19:46 ` Holger Hans Peter Freyther
2010-02-17 19:53 ` Koen Kooi
0 siblings, 1 reply; 7+ messages in thread
From: Holger Hans Peter Freyther @ 2010-02-17 19:46 UTC (permalink / raw)
To: openembedded-devel
On Wednesday 17 February 2010 12:32:20 Koen Kooi wrote:
for me.. but if it's right way, then it should be
> > integrated to .inc files instead.
>
> Your patch looks good to me, but I'd like zecke to comment on it. Holger?
Can't hurt..
Acked-by: Holger Hans Peter Freyther <zecke@selfish.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Koen Kooi : qt4: add 4.6.2
2010-02-17 19:46 ` Holger Hans Peter Freyther
@ 2010-02-17 19:53 ` Koen Kooi
2010-02-18 8:49 ` Martin Jansa
2010-02-18 10:20 ` Martin Jansa
0 siblings, 2 replies; 7+ messages in thread
From: Koen Kooi @ 2010-02-17 19:53 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 17-02-10 20:46, Holger Hans Peter Freyther wrote:
> On Wednesday 17 February 2010 12:32:20 Koen Kooi wrote:
> for me.. but if it's right way, then it should be
>>> integrated to .inc files instead.
>>
>> Your patch looks good to me, but I'd like zecke to comment on it. Holger?
>
> Can't hurt..
>
> Acked-by: Holger Hans Peter Freyther <zecke@selfish.org>
Acked-by: Koen Kooi <koen@openembedded.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFLfEk+MkyGM64RGpERAlK/AKCYaiWxXnDLcIsd61mlXzR/kMBV6ACeJ3Bf
wgQMARXWGwbflsBAs5VxkPY=
=qnz/
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Koen Kooi : qt4: add 4.6.2
2010-02-17 19:53 ` Koen Kooi
@ 2010-02-18 8:49 ` Martin Jansa
2010-02-18 10:20 ` Martin Jansa
1 sibling, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2010-02-18 8:49 UTC (permalink / raw)
To: openembedded-devel; +Cc: Jeremy Lainé
On Wed, Feb 17, 2010 at 08:53:34PM +0100, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 17-02-10 20:46, Holger Hans Peter Freyther wrote:
> > On Wednesday 17 February 2010 12:32:20 Koen Kooi wrote:
> > for me.. but if it's right way, then it should be
> >>> integrated to .inc files instead.
Thanks for ACKs :).
I guess that part for integrating to .inc is left for me..
But I've seen that -L -I configure params used in non-native .inc
already, so it should be safe.
Do you remember why LFLAGS was introduced? patch is from 4.3.3/4.5 and I
guess it's not needed anymore at least for any 4.6*.
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=8f61b0343b6c56644fdaa8fa3e84e1c29d3f47b9
I would drop it from 4.6 and let in 4.3 and 4.5 as I'm not
really looking forward for rebuilding all of them.
Regards,
> >>
> >> Your patch looks good to me, but I'd like zecke to comment on it. Holger?
> >
> > Can't hurt..
> >
> > Acked-by: Holger Hans Peter Freyther <zecke@selfish.org>
>
> Acked-by: Koen Kooi <koen@openembedded.org>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
>
> iD8DBQFLfEk+MkyGM64RGpERAlK/AKCYaiWxXnDLcIsd61mlXzR/kMBV6ACeJ3Bf
> wgQMARXWGwbflsBAs5VxkPY=
> =qnz/
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
uin:136542059 jid:Martin.Jansa@gmail.com
Jansa Martin sip:jamasip@voip.wengo.fr
JaMa
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Koen Kooi : qt4: add 4.6.2
2010-02-17 19:53 ` Koen Kooi
2010-02-18 8:49 ` Martin Jansa
@ 2010-02-18 10:20 ` Martin Jansa
2010-02-18 11:01 ` Koen Kooi
1 sibling, 1 reply; 7+ messages in thread
From: Martin Jansa @ 2010-02-18 10:20 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1036 bytes --]
On Wed, Feb 17, 2010 at 08:53:34PM +0100, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 17-02-10 20:46, Holger Hans Peter Freyther wrote:
> > On Wednesday 17 February 2010 12:32:20 Koen Kooi wrote:
> > for me.. but if it's right way, then it should be
> >>> integrated to .inc files instead.
> >>
> >> Your patch looks good to me, but I'd like zecke to comment on it. Holger?
> >
> > Can't hurt..
> >
> > Acked-by: Holger Hans Peter Freyther <zecke@selfish.org>
>
> Acked-by: Koen Kooi <koen@openembedded.org>
Does both ACKs still hold for this integrated patch?
Tested only on 4.6.2, only change for 4.3 and 4.5 should be added -I -L
options as I didn't want to copy EXTRA_OECONF to those recipes just to
remove them there (if they are not supported I guess only warning about
unrecognized option will be emited).
Regards,
--
uin:136542059 jid:Martin.Jansa@gmail.com
Jansa Martin sip:jamasip@voip.wengo.fr
JaMa
[-- Attachment #2: 0001-qt4-tools-native-set-libdir-and-incdir-in-.inc-file.patch --]
[-- Type: text/plain, Size: 6430 bytes --]
From a40d03fbd8b7ffb8eb4731ddc0885c18535b9d60 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 18 Feb 2010 10:42:17 +0100
Subject: [PATCH] qt4-tools-native: set libdir and incdir in .inc file
* move SRC_URI and EXTRA_OECONF for new versions to .inc and changed to
old version
* remove LFLAGS setting from 4.6.* versions (replaced with -L param)
---
recipes/qt4/qt4-tools-native.inc | 14 +++++++-------
recipes/qt4/qt4-tools-native_4.4.3.bb | 16 ++++++++++++++++
recipes/qt4/qt4-tools-native_4.5.2.bb | 16 ++++++++++++++++
recipes/qt4/qt4-tools-native_4.6.0.bb | 8 +-------
recipes/qt4/qt4-tools-native_4.6.2.bb | 21 +--------------------
5 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index 8f52092..bd0d2e1 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -5,18 +5,19 @@ HOMEPAGE = "http://www.trolltech.com"
PRIORITY = "optional"
LICENSE = "GPL"
-INC_PR = "r5"
+INC_PR = "r6"
inherit native
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
- file://configure-lflags.patch;patch=1 \
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
file://qt-config.patch;patch=1 \
file://g++.conf \
file://linux.conf"
-S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+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-accessibility \
@@ -24,7 +25,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
-no-exceptions \
-no-nas-sound \
-no-nis \
- -verbose -release -fast -static \
+ -verbose -release -static \
-qt3support"
# yank default -e, otherwise we get the following error:
@@ -32,7 +33,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
EXTRA_OEMAKE = " "
do_configure() {
- (echo o; echo yes) | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+ (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
}
TOBUILD = "\
@@ -72,4 +73,3 @@ do_stage() {
install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DATADIR_NATIVE}/qt4/
}
-
diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb
index a734b6b..3ad402f 100644
--- a/recipes/qt4/qt4-tools-native_4.4.3.bb
+++ b/recipes/qt4/qt4-tools-native_4.4.3.bb
@@ -1,2 +1,18 @@
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;patch=1 \
+ file://qt-config.patch;patch=1 \
+ file://g++.conf \
+ file://linux.conf"
+
+S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+
+EXTRA_OECONF += " -fast"
+
+do_configure() {
+ (echo o; echo yes) | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
PR = "${INC_PR}.1"
diff --git a/recipes/qt4/qt4-tools-native_4.5.2.bb b/recipes/qt4/qt4-tools-native_4.5.2.bb
index 8eed003..77171a1 100644
--- a/recipes/qt4/qt4-tools-native_4.5.2.bb
+++ b/recipes/qt4/qt4-tools-native_4.5.2.bb
@@ -1,4 +1,20 @@
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;patch=1 \
+ file://qt-config.patch;patch=1 \
+ file://g++.conf \
+ file://linux.conf"
+
+S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+
+EXTRA_OECONF += " -fast"
+
+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}.1"
diff --git a/recipes/qt4/qt4-tools-native_4.6.0.bb b/recipes/qt4/qt4-tools-native_4.6.0.bb
index 48310b1..44258b2 100644
--- a/recipes/qt4/qt4-tools-native_4.6.0.bb
+++ b/recipes/qt4/qt4-tools-native_4.6.0.bb
@@ -4,12 +4,6 @@ require qt4-tools-native.inc
LICENSE = "LGPLv2.1 GPLv3"
PR = "${INC_PR}.0"
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://configure-lflags.patch;patch=1 \
- file://qt-config.patch;patch=1 \
- file://g++.conf \
- file://linux.conf"
-
-S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+EXTRA_OECONF += " -fast"
TOBUILD := "src/tools/bootstrap ${TOBUILD}"
diff --git a/recipes/qt4/qt4-tools-native_4.6.2.bb b/recipes/qt4/qt4-tools-native_4.6.2.bb
index c40738b..894e497 100644
--- a/recipes/qt4/qt4-tools-native_4.6.2.bb
+++ b/recipes/qt4/qt4-tools-native_4.6.2.bb
@@ -4,25 +4,6 @@ require qt4-tools-native.inc
LICENSE = "LGPLv2.1 GPLv3"
PR = "${INC_PR}.0"
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://configure-lflags.patch;patch=1 \
- file://qt-config.patch;patch=1 \
- 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-accessibility \
- -no-cups \
- -no-exceptions \
- -no-nas-sound \
- -no-nis \
- -verbose -release -no-fast -static \
- -qt3support -silent -no-rpath"
+EXTRA_OECONF += " -no-fast -silent -no-rpath"
TOBUILD := "src/tools/bootstrap ${TOBUILD}"
--
1.7.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: Koen Kooi : qt4: add 4.6.2
2010-02-18 10:20 ` Martin Jansa
@ 2010-02-18 11:01 ` Koen Kooi
0 siblings, 0 replies; 7+ messages in thread
From: Koen Kooi @ 2010-02-18 11:01 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 18-02-10 11:20, Martin Jansa wrote:
> On Wed, Feb 17, 2010 at 08:53:34PM +0100, Koen Kooi wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 17-02-10 20:46, Holger Hans Peter Freyther wrote:
>>> On Wednesday 17 February 2010 12:32:20 Koen Kooi wrote:
>>> for me.. but if it's right way, then it should be
>>>>> integrated to .inc files instead.
>>>>
>>>> Your patch looks good to me, but I'd like zecke to comment on it. Holger?
>>>
>>> Can't hurt..
>>>
>>> Acked-by: Holger Hans Peter Freyther <zecke@selfish.org>
>>
>> Acked-by: Koen Kooi <koen@openembedded.org>
>
> Does both ACKs still hold for this integrated patch?
- From a quick look my ack still holds
>
> Tested only on 4.6.2, only change for 4.3 and 4.5 should be added -I -L
> options as I didn't want to copy EXTRA_OECONF to those recipes just to
> remove them there (if they are not supported I guess only warning about
> unrecognized option will be emited).
>
> Regards,
>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFLfR35MkyGM64RGpERAnv2AJ9Y89RMz/koCwZqdYbuWARAVY/27gCeMPDz
fZU/pYbt2wtw0/mtgolCQCI=
=C7md
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-02-18 11:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1Nhfko-0005L8-Mc@melo.openembedded.org>
2010-02-17 10:48 ` [oe-commits] Koen Kooi : qt4: add 4.6.2 Martin Jansa
2010-02-17 11:32 ` Koen Kooi
2010-02-17 19:46 ` Holger Hans Peter Freyther
2010-02-17 19:53 ` Koen Kooi
2010-02-18 8:49 ` Martin Jansa
2010-02-18 10:20 ` Martin Jansa
2010-02-18 11:01 ` Koen Kooi
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.