diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch | 75 |
1 files changed, 0 insertions, 75 deletions
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 deleted file mode 100644 index c527c131..00000000 --- a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | From b8e94df3d49be69659e8dfb0809c614f73c21706 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 13 Nov 2015 12:36:11 +0100 | ||
4 | Subject: [PATCH] configure paths for target qmake properly | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | to use this patch in all qtbase/qtbase-native(sdk) changes ore made | ||
10 | conditionally based on QT_CROSS_COMPILE | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE specific] | ||
13 | |||
14 | Change-Id: I2b2f00c496216e98fbe14801f9e840ef5333c4b6 | ||
15 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
17 | --- | ||
18 | configure | 23 +++++++++++++++++++---- | ||
19 | 1 file changed, 19 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/configure b/configure | ||
22 | index 5af98cd77e..34dedafe91 100755 | ||
23 | --- a/configure | ||
24 | +++ b/configure | ||
25 | @@ -1500,8 +1500,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then | ||
26 | fi | ||
27 | fi | ||
28 | |||
29 | -shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` | ||
30 | -shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` | ||
31 | +if [ "$QT_CROSS_COMPILE" = "yes" ] ; then | ||
32 | + shortxspec=linux-g++ | ||
33 | + shortspec=linux-g++ | ||
34 | +else | ||
35 | + shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` | ||
36 | + shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` | ||
37 | +fi | ||
38 | |||
39 | QT_CONFIGURE_STR_OFF=0 | ||
40 | |||
41 | @@ -1534,7 +1539,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS | ||
42 | |||
43 | QT_CONFIGURE_STR_OFFSETS= | ||
44 | QT_CONFIGURE_STRS= | ||
45 | -addConfStr "$CFG_SYSROOT" | ||
46 | +if [ "$QT_CROSS_COMPILE" = "yes" ] ; then | ||
47 | + addConfStr "" | ||
48 | +else | ||
49 | + addConfStr "$CFG_SYSROOT" | ||
50 | +fi | ||
51 | addConfStr "$QT_REL_HOST_BINS" | ||
52 | addConfStr "$QT_REL_HOST_LIBS" | ||
53 | addConfStr "$QT_REL_HOST_DATA" | ||
54 | @@ -1546,6 +1555,12 @@ addConfStr "$shortspec" | ||
55 | #------------------------------------------------------------------------------- | ||
56 | [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" | ||
57 | |||
58 | +if [ "$QT_CROSS_COMPILE" = "yes" ] ; then | ||
59 | + QT_TARGET_PREFIX=$QT_EXT_PREFIX | ||
60 | +else | ||
61 | + QT_TARGET_PREFIX=$QT_HOST_PREFIX | ||
62 | +fi | ||
63 | + | ||
64 | cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF | ||
65 | /* Installation date */ | ||
66 | static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; | ||
67 | @@ -1554,7 +1569,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 | ||
68 | static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; | ||
69 | #ifdef QT_BUILD_QMAKE | ||
70 | static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; | ||
71 | -static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX"; | ||
72 | +static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX"; | ||
73 | #endif | ||
74 | |||
75 | static const short qt_configure_str_offsets[] = { | ||