summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-09 14:37:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:45 (GMT)
commitafc6d1bb31a1f28358245a5b2331e999e62bc594 (patch)
tree73f277c8735f6de1ee44bd32ebac85f7f56a849b /meta/recipes-qt
parent6be627fd5f2d1c0ef29d052164f23bc94f914b31 (diff)
downloadpoky-afc6d1bb31a1f28358245a5b2331e999e62bc594.tar.gz
qt4-tools-nativesdk: fix build of 4.7.4
Commit 4ccae37db1aa77a1d15098c3720ea6e2d383fbdc introduced a sed command line to modify a file that only exists in 4.8.0, thus do_configure of 4.7.4 was failing; so make this conditional upon the file existing. (From OE-Core rev: 0b948d20b835387702a4f5e103eaae5b4a330edd) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 4b097cf..64cc1ae 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"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5LICENSE = "LGPLv2.1 | GPLv3" 5LICENSE = "LGPLv2.1 | GPLv3"
6 6
7INC_PR = "r8" 7INC_PR = "r9"
8 8
9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
10 10
@@ -59,9 +59,12 @@ do_configure() {
59 59
60 cp ../g++.conf mkspecs/common 60 cp ../g++.conf mkspecs/common
61 cp ../linux.conf mkspecs/common 61 cp ../linux.conf mkspecs/common
62 # don't use host g++ even during configure 62
63 sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf 63 if [ -f mkspecs/common/g++-base.conf ] ; then
64 sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf 64 # don't use host g++ even during configure (4.8.0+)
65 sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf
66 sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
67 fi
65 68
66 # first launch configure to get qmake compiled for the nativesdk 69 # first launch configure to get qmake compiled for the nativesdk
67 (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true 70 (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true