summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-09 14:37:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:14:49 +0000
commit0b948d20b835387702a4f5e103eaae5b4a330edd (patch)
treead46dc2f8d6fcc56eea4c9bc61bc938fe4d579f5 /meta/recipes-qt
parent4306606489a2d922595d4c86a21c496bbd8a607e (diff)
downloadopenembedded-core-0b948d20b835387702a4f5e103eaae5b4a330edd.tar.gz
openembedded-core-0b948d20b835387702a4f5e103eaae5b4a330edd.tar.bz2
openembedded-core-0b948d20b835387702a4f5e103eaae5b4a330edd.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
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 4b097cf4d9..64cc1aebea 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"
HOMEPAGE = "http://qt.nokia.com"
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r8"
+INC_PR = "r9"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
@@ -59,9 +59,12 @@ do_configure() {
cp ../g++.conf mkspecs/common
cp ../linux.conf mkspecs/common
- # don't use host g++ even during configure
- sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf
- sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
+
+ if [ -f mkspecs/common/g++-base.conf ] ; then
+ # don't use host g++ even during configure (4.8.0+)
+ sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf
+ sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
+ fi
# first launch configure to get qmake compiled for the nativesdk
(echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true