[oe] [meta-qt5][PATCH 2/2] qtbase: align target qmake paths

[Martin Jansa]

On Wed, Nov 04, 2015 at 06:30:09PM +0100, Andreas Müller wrote:
> With this we can setup qt-creator to build/debug on target again.

Can we apply this change to qtbase-native and nativesdk-qtbase as well
or will it break things?

With 5.6 I was finally able to use the same patches for target qtbase
and native(sdk) with only:
    file://0008-Always-build-uic.patch \
    file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
included only for native(sdk) that makes my qtbase branches in
github.com/meta-qt5/qtbase a lot easier to maintain.

If it cannot be changed for all, can we make it conditional, e.g. 
[ "$QT_CROSS_COMPILE" = "yes" ]
like in new version of:
https://github.com/meta-qt5/qtbase/commit/10283d010d7a66c485cda1e9b1c0cf7c41e358b3

?

> 
> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
> ---
>  ...configure-paths-for-target-qmake-properly.patch | 46 ++++++++++++++++++++++
>  recipes-qt/qt5/qtbase_git.bb                       |  1 +
>  2 files changed, 47 insertions(+)
>  create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> 
> diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> new file mode 100644
> index 0000000..a20164b
> --- /dev/null
> +++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> @@ -0,0 +1,46 @@
> +From ecf12f418eb3a186af0276420576bac9e7974e71 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at googlemail.com>
> +Date: Wed, 4 Nov 2015 10:36:26 +0100
> +Subject: [PATCH] configure paths for target qmake properly
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
> +---
> + configure | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/configure b/configure
> +index 6f338f3..82e3ae3 100755
> +--- a/configure
> ++++ b/configure
> +@@ -3842,12 +3842,12 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
> + 
> + QT_CONFIGURE_STR_OFFSETS=
> + QT_CONFIGURE_STRS=
> +-addConfStr "$CFG_SYSROOT"
> ++addConfStr ""
> + addConfStr "$QT_REL_HOST_BINS"
> + addConfStr "$QT_REL_HOST_LIBS"
> + addConfStr "$QT_REL_HOST_DATA"
> + addConfStr "$shortxspec"
> +-addConfStr "$shortspec"
> ++addConfStr "$shortxspec"
> + 
> + #-------------------------------------------------------------------------------
> + # generate qconfig.cpp
> +@@ -3866,7 +3866,7 @@ static const char qt_configure_installation          [12+11]    = "qt_instdate=2
> + static const char qt_configure_prefix_path_str       [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
> + #ifdef QT_BUILD_QMAKE
> + static const char qt_configure_ext_prefix_path_str   [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> +-static const char qt_configure_host_prefix_path_str  [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
> ++static const char qt_configure_host_prefix_path_str  [512 + 12] = "qt_hpfxpath=$QT_EXT_PREFIX";
> + #endif
> + 
> + static const short qt_configure_str_offsets[] = {
> +-- 
> +2.1.0
> +
> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
> index 0ba8ac8..3ef5923 100644
> --- a/recipes-qt/qt5/qtbase_git.bb
> +++ b/recipes-qt/qt5/qtbase_git.bb
> @@ -26,6 +26,7 @@ SRC_URI += "\
>      file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
>      file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
>      file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \
> +    file://0011-configure-paths-for-target-qmake-properly.patch \
>  "
>  
>  DEPENDS += "qtbase-native"
> -- 
> 2.1.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20151104/64c9127a/attachment-0002.sig>