diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-02-17 11:39:34 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-02-18 14:33:34 +0100 |
| commit | 357e89f526a8b50f71e9cc815d4eeee8b78cb8d3 (patch) | |
| tree | b5b6bf0ff4d037950ffe189fa09212a3a304b9c7 /recipes/qt4/qt4-tools-native.inc | |
| parent | b377f83fde485aa4f1bf3f99e907d89bfdd7686d (diff) | |
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)
* Idea also Acked-by: Holger Hans Peter Freyther <zecke@selfish.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'recipes/qt4/qt4-tools-native.inc')
| -rw-r--r-- | recipes/qt4/qt4-tools-native.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc index 8f520926ce..bd0d2e138e 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/ } - |