diff options
author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-08-12 18:18:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-15 15:33:49 +0100 |
commit | 45416a04123a46ce0a35c6b9286bf53f2f8ce257 (patch) | |
tree | b51daee108969d43b2ff711a86389f6ec6d6995d | |
parent | 1a6bcb62666b0fc67a66bd38a1c3f2a3399a249f (diff) | |
download | meta-qt3-45416a04123a46ce0a35c6b9286bf53f2f8ce257.tar.gz |
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>
-rw-r--r-- | recipes-qt3/qt3/qt-x11-free-common.inc | 8 |
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" | |||
3 | PRIORITY = "optional" | 3 | PRIORITY = "optional" |
4 | LICENSE = "GPL | QPL" | 4 | LICENSE = "GPL | QPL" |
5 | HOMEPAGE = "http://www.trolltech.com" | 5 | HOMEPAGE = "http://www.trolltech.com" |
6 | PR = "r0" | 6 | PR = "r1" |
7 | 7 | ||
8 | S = "${WORKDIR}/qt-x11-free-${PV}" | 8 | S = "${WORKDIR}/qt-x11-free-${PV}" |
9 | 9 | ||
@@ -24,6 +24,12 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INC | |||
24 | AR="${TARGET_PREFIX}ar cqs" \ | 24 | AR="${TARGET_PREFIX}ar cqs" \ |
25 | MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"' | 25 | MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"' |
26 | 26 | ||
27 | do_configure_prepend() { | ||
28 | if [ ! -L ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ ]; then | ||
29 | ln -sf ${QMAKE_MKSPEC_PATH}/linux-g++ ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ | ||
30 | fi | ||
31 | } | ||
32 | |||
27 | do_configure() { | 33 | do_configure() { |
28 | echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \ | 34 | echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \ |
29 | -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql | 35 | -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql |