summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Yanok <yanok@emcraft.com>2011-05-12 20:11:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-13 10:29:02 +0100
commitf8382175a1a5a6f3fdcfb55e73b8782a953b517c (patch)
tree36e084e751a2bd2159ecae7947a714c93c5fc794
parent021e79298848a89beb34f5a387d830ae8454bf82 (diff)
downloadpoky-f8382175a1a5a6f3fdcfb55e73b8782a953b517c.tar.gz
qt4-tools-nativesdk: -arch is required for nativesdk build
We need to pass correct -arch option to configure to fix building in case of SDK_ARCH != BUILD_ARCH. (From OE-Core rev: af22757737f3b5e2d58eba8c5e01176ac26592c5) Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index f273c9fab8..5faf40c33a 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -25,6 +25,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
25 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 25 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
26 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 26 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
27 27
28require qt4_arch.inc
29
28# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1" 30# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
29EXTRA_OECONF = "-prefix ${prefix} \ 31EXTRA_OECONF = "-prefix ${prefix} \
30 -qt-libjpeg -qt-gif -system-zlib \ 32 -qt-libjpeg -qt-gif -system-zlib \
@@ -37,6 +39,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
37 -verbose -release -fast -static \ 39 -verbose -release -fast -static \
38 -platform ${TARGET_OS}-oe-g++ \ 40 -platform ${TARGET_OS}-oe-g++ \
39 -xplatform ${TARGET_OS}-oe-g++ \ 41 -xplatform ${TARGET_OS}-oe-g++ \
42 -arch ${@qt_arch(d)} \
40 -embedded -no-freetype -no-glib -no-iconv \ 43 -embedded -no-freetype -no-glib -no-iconv \
41 -qt3support \ 44 -qt3support \
42 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \ 45 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \