mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

qt4-tools-nativesdk: fix build of 4.7.4

Browse Source 
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>
This commit is contained in:
Paul Eggleton
2012-02-09 14:37:34 +00:00
committed by Richard Purdie
parent 6be627fd5f
commit afc6d1bb31
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+7 -4
View File
@@ -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