diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-24 15:01:56 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-25 11:56:33 +0200 |
commit | 44d180c09346cb5b04636e19a41a7f0cc3b3c32e (patch) | |
tree | 1f1d8b4daf6b1f964df7c87207a77e13f2659c84 /recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch | |
parent | 40b7a93a3c6cf05136c606824c1cea848b75bcb6 (diff) | |
download | meta-qt5-44d180c09346cb5b04636e19a41a7f0cc3b3c32e.tar.gz |
qtbase: refresh patches
* based on b5.5.0 branches in https://github.com/meta-qt5/qtbase
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch | 130 |
1 files changed, 0 insertions, 130 deletions
diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch deleted file mode 100644 index 546e954b..00000000 --- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch +++ /dev/null | |||
@@ -1,130 +0,0 @@ | |||
1 | From 45bdf5ff770fe17634f216c3f533645bfd450f04 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | ||
4 | Subject: [PATCH 9/9] Add -external-hostbindir option for native(sdk) | ||
5 | |||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | ||
7 | (or in OpenEmbedded built with separate native recipe) when building for target | ||
8 | |||
9 | * this way we can skip bootstraping tools we already have | ||
10 | |||
11 | * qt_functions: temporary remove isEmpty check | ||
12 | * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value | ||
13 | * isEmpty works correctly only with qmake variables (e.g. $$FOO - | ||
14 | isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. | ||
15 | |||
16 | * cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | is a lot better for upstreaming (and it was already sort of approved by | ||
20 | Oswald) but in 5.2.0 I've noticed that he added something similar for | ||
21 | android builds | ||
22 | |||
23 | Change-Id: I4f6e634bf0b2cb96065ee5c38b9cd8a224c3bd37 | ||
24 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
25 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
26 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
27 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
28 | |||
29 | Conflicts: | ||
30 | tools/configure/configureapp.cpp | ||
31 | --- | ||
32 | qmake/property.cpp | 1 + | ||
33 | src/corelib/global/qlibraryinfo.cpp | 3 ++- | ||
34 | src/corelib/global/qlibraryinfo.h | 1 + | ||
35 | tools/configure/configureapp.cpp | 11 +++++++++++ | ||
36 | 4 files changed, 15 insertions(+), 1 deletion(-) | ||
37 | |||
38 | diff --git a/configure b/configure | ||
39 | index ffb69df..aa46774 100755 | ||
40 | --- a/configure | ||
41 | +++ b/configure | ||
42 | @@ -3831,6 +3831,7 @@ addConfStr "$CFG_SYSROOT" | ||
43 | addConfStr "$QT_REL_HOST_BINS" | ||
44 | addConfStr "$QT_REL_HOST_LIBS" | ||
45 | addConfStr "$QT_REL_HOST_DATA" | ||
46 | +addConfStr "$QT_EXTERNAL_HOST_BINS" | ||
47 | addConfStr "$shortxspec" | ||
48 | addConfStr "$shortspec" | ||
49 | |||
50 | diff --git a/qmake/property.cpp b/qmake/property.cpp | ||
51 | index 817ae95..c69539f 100644 | ||
52 | --- a/qmake/property.cpp | ||
53 | +++ b/qmake/property.cpp | ||
54 | @@ -68,6 +68,7 @@ static const struct { | ||
55 | { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, | ||
56 | { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, | ||
57 | { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, | ||
58 | + { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, | ||
59 | { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, | ||
60 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, | ||
61 | }; | ||
62 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | ||
63 | index f663c88..675bd4c 100644 | ||
64 | --- a/src/corelib/global/qlibraryinfo.cpp | ||
65 | +++ b/src/corelib/global/qlibraryinfo.cpp | ||
66 | @@ -373,7 +373,7 @@ QLibraryInfo::isDebugBuild() | ||
67 | */ | ||
68 | |||
69 | static const struct { | ||
70 | - char key[19], value[13]; | ||
71 | + char key[21], value[13]; | ||
72 | } qtConfEntries[] = { | ||
73 | { "Prefix", "." }, | ||
74 | { "Documentation", "doc" }, // should be ${Data}/doc | ||
75 | @@ -398,6 +398,7 @@ static const struct { | ||
76 | { "HostBinaries", "bin" }, | ||
77 | { "HostLibraries", "lib" }, | ||
78 | { "HostData", "." }, | ||
79 | + { "ExternalHostBinaries", "" }, | ||
80 | { "TargetSpec", "" }, | ||
81 | { "HostSpec", "" }, | ||
82 | { "HostPrefix", "" }, | ||
83 | diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h | ||
84 | index 1ad7637..5a8b127 100644 | ||
85 | --- a/src/corelib/global/qlibraryinfo.h | ||
86 | +++ b/src/corelib/global/qlibraryinfo.h | ||
87 | @@ -81,6 +81,7 @@ public: | ||
88 | HostBinariesPath, | ||
89 | HostLibrariesPath, | ||
90 | HostDataPath, | ||
91 | + ExternalHostBinariesPath, | ||
92 | TargetSpecPath, | ||
93 | HostSpecPath, | ||
94 | HostPrefixPath, | ||
95 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | ||
96 | index 3bf0546..53bf146 100644 | ||
97 | --- a/tools/configure/configureapp.cpp | ||
98 | +++ b/tools/configure/configureapp.cpp | ||
99 | @@ -1217,6 +1217,13 @@ void Configure::parseCmdLine() | ||
100 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); | ||
101 | } | ||
102 | |||
103 | + else if (configCmdLine.at(i) == "-external-hostbindir") { | ||
104 | + ++i; | ||
105 | + if (i == argCount) | ||
106 | + break; | ||
107 | + dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i); | ||
108 | + } | ||
109 | + | ||
110 | else if (configCmdLine.at(i) == "-make-tool") { | ||
111 | ++i; | ||
112 | if (i == argCount) | ||
113 | @@ -4101,6 +4108,9 @@ void Configure::generateQConfigCpp() | ||
114 | |||
115 | if (dictionary["QT_REL_HOST_DATA"].isEmpty()) | ||
116 | dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; | ||
117 | + | ||
118 | + if (dictionary["QT_EXTERNAL_HOST_BINS"].isEmpty()) | ||
119 | + dictionary["QT_EXTERNAL_HOST_BINS"] = haveHpx ? "bin" : dictionary["QT_REL_INSTALL_BINS"]; | ||
120 | |||
121 | confStringOff = 0; | ||
122 | addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); | ||
123 | @@ -4120,6 +4130,7 @@ void Configure::generateQConfigCpp() | ||
124 | addConfStr(1, dictionary["QT_REL_HOST_BINS"]); | ||
125 | addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); | ||
126 | addConfStr(1, dictionary["QT_REL_HOST_DATA"]); | ||
127 | + addConfStr(1, dictionary["QT_EXTERNAL_HOST_BINS"]); | ||
128 | addConfStr(1, targSpec); | ||
129 | addConfStr(1, hostSpec); | ||
130 | |||