summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-09 17:38:21 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:45 (GMT)
commit0733f7a4a948d23afb87a8dc1acf8327c0e91aa0 (patch)
treeca6c446a4d3367841383f1e925d5588c58ea2021
parentafc6d1bb31a1f28358245a5b2331e999e62bc594 (diff)
downloadpoky-0733f7a4a948d23afb87a8dc1acf8327c0e91aa0.tar.gz
qt4-tools-nativesdk: improve and tidy up qmake build
* Use the same method to build qmake as in the qt4 target recipes * We always have qmake from qt4-native so don't check if it exists - just skip the check like we do in the qt4 target recipes. This saves us a patch. * Replace qt4-tools-native in DEPENDS with qt4-native (From OE-Core rev: 71153270466352245fe2aa3318bbabb1f8062ed2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/files/qmake-exists-check.patch19
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc22
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb2
3 files changed, 15 insertions, 28 deletions
diff --git a/meta/recipes-qt/qt4/files/qmake-exists-check.patch b/meta/recipes-qt/qt4/files/qmake-exists-check.patch
deleted file mode 100644
index 27d21e0..0000000
--- a/meta/recipes-qt/qt4/files/qmake-exists-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1qt4-tools-nativesdk: avoid rebuilding qmake
2
3qt4-tools-nativesdk patch to avoids building qmake in configure if it already exists
4(as it will, since we symlink it in from the native sysroot in do_configure)
5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7Upstream-Status: Inappropriate [configuration]
8
9--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000
10+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000
11@@ -4286,7 +4286,7 @@
12 }
13
14 # build qmake
15-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
16+if [ '!' -f "$outpath/bin/qmake" ]; then
17 echo "Creating qmake. Please wait..."
18
19 OLD_QCONFIG_H=
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 64cc1ae..efb61bf 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -1,21 +1,22 @@
1DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x" 1DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
2DEPENDS = "zlib-nativesdk dbus-nativesdk libx11-nativesdk qt4-tools-native" 2DEPENDS = "zlib-nativesdk dbus-nativesdk libx11-nativesdk qt4-native"
3SECTION = "libs" 3SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5LICENSE = "LGPLv2.1 | GPLv3" 5LICENSE = "LGPLv2.1 | GPLv3"
6 6
7INC_PR = "r9" 7INC_PR = "r10"
8 8
9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
10 10
11inherit nativesdk qmake2 11inherit nativesdk qmake2
12 12
13SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 13SRC_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
104do_install() { 108do_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
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
index e615d36..02917fe 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
@@ -2,6 +2,8 @@ require qt4-tools-nativesdk.inc
2 2
3PR = "${INC_PR}.0" 3PR = "${INC_PR}.0"
4 4
5SRC_URI += "file://qmake_pri_fixes.patch"
6
5DEFAULT_PREFERENCE = "-1" 7DEFAULT_PREFERENCE = "-1"
6 8
7SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904" 9SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904"