| Submitter | Xiaofeng Yan |
|---|---|
| Date | Aug. 12, 2011, 10:18 a.m. |
| Message ID | <6da4b426f8aa96335542deb671a21f99b8e0f398.1313141568.git.xiaofeng.yan@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/9759/ |
| State | New, archived |
| Headers | show |
Comments
On Fri, 2011-08-12 at 18:18 +0800, Xiaofeng Yan wrote: > From: Xiaofeng Yan <xiaofeng.yan@windriver.com> > > [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> > --- > 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 Thanks, this looks like a better fix to me. I've merged this with an updated commit message. The commit message summary needs to state what the problem is, not just a bug number. Cheers, Richard
Patch
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>
---
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
From: Xiaofeng Yan <xiaofeng.yan@windriver.com> [YOCTO #1348] The variable is different when building qt-x11-free-native and qt-x11-free. The