diff options
| author |   Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-08-12 17:19:10 +0800 |
|---|---|---|
| committer | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-08-12 17:19:10 +0800 |
| commit | 6da4b426f8aa96335542deb671a21f99b8e0f398 (patch) | |
| tree | b51daee108969d43b2ff711a86389f6ec6d6995d | |
| parent | 1a6bcb62666b0fc67a66bd38a1c3f2a3399a249f (diff) | |
| download | meta-qt3-xiaofeng/meta-qt3.tar.gz meta-qt3-xiaofeng/meta-qt3.tar.bz2 meta-qt3-xiaofeng/meta-qt3.zip | |
qt3: fix bug 1348xiaofeng/meta-qt3
[YOCTO #1348]
The variable is different when building qt-x11-free-native and qt-x11-free. The
different cause this bug.
$ 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 I add a task function before do_configure for linking ${TARGET_OS} to linux-g++.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
| -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" 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 |