From patchwork Tue Feb 28 05:25:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED,PULL,06/36] qt4-tools-nativesdk: fix build of 4.7.4 Date: Tue, 28 Feb 2012 05:25:04 -0000 From: Saul Wold X-Patchwork-Id: 22209 Message-Id: <668ee69cefe2ccffab3f10199726fd5b60856aac.1330406574.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Paul Eggleton 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 --- meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 11 +++++++---- 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" 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