aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt3
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-08-12 18:18:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 15:33:49 +0100
commit45416a04123a46ce0a35c6b9286bf53f2f8ce257 (patch)
treeb51daee108969d43b2ff711a86389f6ec6d6995d /recipes-qt3
parent1a6bcb62666b0fc67a66bd38a1c3f2a3399a249f (diff)
downloadmeta-qt3-45416a04123a46ce0a35c6b9286bf53f2f8ce257.tar.gz
meta-qt3-45416a04123a46ce0a35c6b9286bf53f2f8ce257.tar.bz2
meta-qt3-45416a04123a46ce0a35c6b9286bf53f2f8ce257.zip
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 <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'recipes-qt3')
-rw-r--r--recipes-qt3/qt3/qt-x11-free-common.inc8
1 files changed, 7 insertions, 1 deletions
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