diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-tools-nativesdk.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index efb61bf142..a1dd8df0d1 100644 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | |||
@@ -4,7 +4,7 @@ SECTION = "libs" | |||
4 | HOMEPAGE = "http://qt.nokia.com" | 4 | HOMEPAGE = "http://qt.nokia.com" |
5 | LICENSE = "LGPLv2.1 | GPLv3" | 5 | LICENSE = "LGPLv2.1 | GPLv3" |
6 | 6 | ||
7 | INC_PR = "r10" | 7 | INC_PR = "r11" |
8 | 8 | ||
9 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" | 9 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" |
10 | 10 | ||
@@ -40,7 +40,7 @@ EXTRA_OECONF = "-prefix ${prefix} \ | |||
40 | -verbose -release -fast -static \ | 40 | -verbose -release -fast -static \ |
41 | -platform ${TARGET_OS}-oe-g++ \ | 41 | -platform ${TARGET_OS}-oe-g++ \ |
42 | -xplatform ${TARGET_OS}-oe-g++ \ | 42 | -xplatform ${TARGET_OS}-oe-g++ \ |
43 | -arch ${@qt_arch(d)} \ | 43 | -arch ${QT_ARCH} \ |
44 | -embedded -no-freetype -no-glib -no-iconv \ | 44 | -embedded -no-freetype -no-glib -no-iconv \ |
45 | -qt3support \ | 45 | -qt3support \ |
46 | -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \ | 46 | -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \ |
@@ -71,6 +71,7 @@ do_configure() { | |||
71 | if [ ! -e bin/qmake ]; then | 71 | if [ ! -e bin/qmake ]; then |
72 | ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake | 72 | ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake |
73 | fi | 73 | fi |
74 | set_arch | ||
74 | (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" | 75 | (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" |
75 | } | 76 | } |
76 | 77 | ||