[PATCH 0/1] qt3: fix bug 1348

[PATCH 0/1] qt3: fix bug 1348

[Xiaofeng Yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Hi Richard,
I modified this bug according to your suggestion. If you have any suggestion, I will modify it. 

Pull URL: git://git.pokylinux.org/meta-qt3.git
  Branch: xiaofeng/meta-qt3
  Browse: http://git.yoctoproject.org/cgit/cgit.cgi/meta-qt3/commit/?h=xiaofeng/meta-qt3

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  qt3: fix bug 1348

 recipes-qt3/qt3/qt-x11-free-common.inc |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

[PATCH 1/1] qt3: fix bug 1348

[Xiaofeng Yan]

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
-- 
1.7.0.4

Re: [PATCH 1/1] qt3: fix bug 1348

[Richard Purdie]

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