From 45416a04123a46ce0a35c6b9286bf53f2f8ce257 Mon Sep 17 00:00:00 2001 From: Xiaofeng Yan Date: Fri, 12 Aug 2011 18:18:17 +0800 Subject: qt3: Stop TARGET_OS differences causing build failures [YOCTO #1348] The TARGET_OS variable can differ with values like "linux" to "linux-gnueabi". If these values change from the native to target tools, problems can occur, e.g. when building qt-x11-free-native and qt-x11-free: $ bitbake qt-x11-free-native -e | grep ^TARGET_OS TARGET_OS="linux" $ bitbake qt-x11-free -e | grep ^TARGET_OS TARGET_OS="linux-gnueabi" So add a task function before do_configure for linking ${TARGET_OS} to linux-g++. Signed-off-by: Xiaofeng Yan Signed-off-by: Richard Purdie --- recipes-qt3/qt3/qt-x11-free-common.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipes-qt3/qt3/qt-x11-free-common.inc b/recipes-qt3/qt3/qt-x11-free-common.inc index e486c52..9e6cc81 100644 --- a/recipes-qt3/qt3/qt-x11-free-common.inc +++ b/recipes-qt3/qt3/qt-x11-free-common.inc @@ -3,7 +3,7 @@ SECTION = "x11/libs" PRIORITY = "optional" LICENSE = "GPL | QPL" HOMEPAGE = "http://www.trolltech.com" -PR = "r0" +PR = "r1" S = "${WORKDIR}/qt-x11-free-${PV}" @@ -24,6 +24,12 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INC AR="${TARGET_PREFIX}ar cqs" \ MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"' +do_configure_prepend() { + if [ ! -L ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ ]; then + ln -sf ${QMAKE_MKSPEC_PATH}/linux-g++ ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ + fi +} + do_configure() { echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql -- cgit v1.2.3-54-g00ecf