diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-tools-nativesdk.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index 275fdcc68c..4b097cf4d9 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 = "r7" +INC_PR = "r8" FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" @@ -12,7 +12,6 @@ inherit nativesdk qmake2 SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ file://configure-lflags.patch \ - file://compile.test-lflags.patch \ file://qt-config.patch \ file://qmake-exists-check.patch \ file://configure-paths.patch \ @@ -51,12 +50,18 @@ EXTRA_OECONF = "-prefix ${prefix} \ EXTRA_OEMAKE = " " do_configure() { + # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD + if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ fi 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 # first launch configure to get qmake compiled for the nativesdk (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true @@ -66,7 +71,6 @@ do_configure() { if [ ! -e bin/qmake ]; then ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake fi - (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } |