This patch is based on the 6 patches Denys submitted earlier.

> -----Original Message-----
> From: Cooper Jr., Franklin
> Sent: Sunday, November 17, 2013 12:07 PM
> To: [email protected]
> Cc: Cooper Jr., Franklin
> Subject: [PATCH] meta-toolchain-arago-qte: Fix location for host Qt tools
> 
> * By default Qt5 is looking at cortexa8hf-vfp-neon-oe-linux-gnueabi/bin 
> instead
>   of the proper location i686-arago-linux/usr/bin/qt5.
> * Update qmake.conf to insure qmake looks at the proper location for host
>   binaries.
> 
> Signed-off-by: Franklin S. Cooper Jr <[email protected]>
> ---
>  .../recipes-core/meta/meta-toolchain-arago-qte.bb  |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
> 
> diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
> b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
> index e3bf80f..6220578 100644
> --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
> +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
> @@ -5,7 +5,7 @@ TOOLCHAIN_SUFFIX ?= "-qte-sdk"
> 
>  require meta-toolchain-arago.bb
> 
> -PR = "r16"
> +PR = "r17"
> 
>  # There could be qt5, qt4e and qt4x11 providers, but we don't support qt4x11
> for now  QT_DIR_NAME = "${@base_conditional('QT_PROVIDER', 'qt5', 'qt5',
> 'qtopia', d)}"
> @@ -46,6 +46,12 @@ toolchain_create_sdk_env_script_append() {
>       echo 'Libraries = $(OE_QMAKE_LIBDIR_QT)' >> $qt_conf
>       echo 'Headers = $(OE_QMAKE_INCDIR_QT)' >> $qt_conf
> 
> +     if [ "${QT_PROVIDER}" = "qt5" ]
> +     then
> +             echo 'HostBinaries = ../${SDK_SYS}/usr/bin/qt5' >> $qt_conf
> +     fi
> +
> +
>       # make a symbolic link to mkspecs for compatibility with Nokia's SDK
>       # and QTCreator
>       (cd ${SDK_OUTPUT}/${SDKTARGETSYSROOT}; ln -sf
> .${QT_MKSPECS_LOCATION}/${QT_DIR_NAME}/mkspecs mkspecs;)
> --
> 1.7.0.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to