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 <[email protected]> > > Acked-by: Koen Kooi <[email protected]>
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:[email protected] Jansa Martin sip:[email protected] JaMa
>From a40d03fbd8b7ffb8eb4731ddc0885c18535b9d60 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> 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
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
