diff options
Diffstat (limited to 'meta/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch')
| -rw-r--r-- | meta/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/meta/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch new file mode 100644 index 0000000000..3375c8c3d1 --- /dev/null +++ b/meta/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch @@ -0,0 +1,75 @@ +From 5e8f8f44227fea48b84fd79e1fc4122d66776bf3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Fri, 13 Nov 2015 12:36:11 +0100 +Subject: [PATCH] configure paths for target qmake properly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +to use this patch in all qtbase/qtbase-native(sdk) changes ore made +conditionally based on QT_CROSS_COMPILE + +Upstream-Status: Inappropriate [OE specific] + +Change-Id: I2b2f00c496216e98fbe14801f9e840ef5333c4b6 +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index df089f2..224f9f5 100755 +--- a/configure ++++ b/configure +@@ -3904,8 +3904,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" + fi + +-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` +-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then ++ shortxspec=linux-g++ ++ shortspec=linux-g++ ++else ++ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` ++ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` ++fi + + QT_CONFIGURE_STR_OFF=0 + +@@ -3938,7 +3943,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS + + QT_CONFIGURE_STR_OFFSETS= + QT_CONFIGURE_STRS= +-addConfStr "$CFG_SYSROOT" ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then ++ addConfStr "" ++else ++ addConfStr "$CFG_SYSROOT" ++fi + addConfStr "$QT_REL_HOST_BINS" + addConfStr "$QT_REL_HOST_LIBS" + addConfStr "$QT_REL_HOST_DATA" +@@ -3950,6 +3959,12 @@ addConfStr "$shortspec" + #------------------------------------------------------------------------------- + [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" + ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then ++ QT_TARGET_PREFIX=$QT_EXT_PREFIX ++else ++ QT_TARGET_PREFIX=$QT_HOST_PREFIX ++fi ++ + cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF + /* License Info */ + static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; +@@ -3962,7 +3977,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_TARGET_PREFIX"; + #endif + + static const short qt_configure_str_offsets[] = { |