diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-tools-nativesdk.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index 64cc1aebea..efb61bf142 100644 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | |||
@@ -1,21 +1,22 @@ | |||
1 | DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x" | 1 | DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x" |
2 | DEPENDS = "zlib-nativesdk dbus-nativesdk libx11-nativesdk qt4-tools-native" | 2 | DEPENDS = "zlib-nativesdk dbus-nativesdk libx11-nativesdk qt4-native" |
3 | SECTION = "libs" | 3 | 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 = "r9" | 7 | INC_PR = "r10" |
8 | 8 | ||
9 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" | 9 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" |
10 | 10 | ||
11 | inherit nativesdk qmake2 | 11 | inherit nativesdk qmake2 |
12 | 12 | ||
13 | SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ | 13 | SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ |
14 | file://0004-no-qmake.patch \ | ||
14 | file://configure-lflags.patch \ | 15 | file://configure-lflags.patch \ |
15 | file://qt-config.patch \ | 16 | file://qt-config.patch \ |
16 | file://qmake-exists-check.patch \ | ||
17 | file://configure-paths.patch \ | 17 | file://configure-paths.patch \ |
18 | file://qt-dbus-const.patch \ | 18 | file://qt-dbus-const.patch \ |
19 | file://target_qmake.patch \ | ||
19 | file://g++.conf \ | 20 | file://g++.conf \ |
20 | file://linux.conf" | 21 | file://linux.conf" |
21 | 22 | ||
@@ -66,11 +67,7 @@ do_configure() { | |||
66 | sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf | 67 | sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf |
67 | fi | 68 | fi |
68 | 69 | ||
69 | # first launch configure to get qmake compiled for the nativesdk | 70 | # Use qmake from qt4-native for building |
70 | (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true | ||
71 | |||
72 | # then backup the binary and start again with a qmake which can run on the build host | ||
73 | mv bin/qmake bin/qmake_nativesdk | ||
74 | if [ ! -e bin/qmake ]; then | 71 | if [ ! -e bin/qmake ]; then |
75 | ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake | 72 | ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake |
76 | fi | 73 | fi |
@@ -99,11 +96,18 @@ do_compile() { | |||
99 | for i in ${TOBUILD}; do | 96 | for i in ${TOBUILD}; do |
100 | cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" | 97 | cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" |
101 | done | 98 | done |
99 | |||
100 | # Build nativesdk qmake | ||
101 | export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" | ||
102 | cd ${S}/qmake | ||
103 | ${OE_QMAKE_QMAKE} | ||
104 | oe_runmake CC="${CC}" CXX="${CXX}" | ||
105 | cd ${S} | ||
102 | } | 106 | } |
103 | 107 | ||
104 | do_install() { | 108 | do_install() { |
105 | install -d ${D}${bindir} | 109 | install -d ${D}${bindir} |
106 | install -m 0755 bin/qmake_nativesdk ${D}${bindir}/qmake2 | 110 | install -m 0755 bin/qmake2 ${D}${bindir}/qmake2 |
107 | for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do | 111 | for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do |
108 | install -m 0755 bin/${i} ${D}${bindir}/${i}4 | 112 | install -m 0755 bin/${i} ${D}${bindir}/${i}4 |
109 | done | 113 | done |