diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 01d1e454..c633ea70 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e263260c50051327e3f7f2ca8c46e014228e0078 Mon Sep 17 00:00:00 2001 | 1 | From f2d51e50a7fbdf485696d1b8b2d29e64c729c76b Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 03/13] Add -external-hostbindir option | 4 | Subject: [PATCH 03/11] Add -external-hostbindir option |
5 | 5 | ||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | 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 | 7 | (or in OpenEmbedded built with separate native recipe) when building for target |
@@ -28,20 +28,20 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
28 | mkspecs/features/qt_functions.prf | 6 +++++- | 28 | mkspecs/features/qt_functions.prf | 6 +++++- |
29 | mkspecs/features/qt_tool.prf | 4 ++-- | 29 | mkspecs/features/qt_tool.prf | 4 ++-- |
30 | qmake/property.cpp | 1 + | 30 | qmake/property.cpp | 1 + |
31 | qtbase.pro | 14 +++++++++++--- | 31 | qtbase.pro | 13 ++++++++++--- |
32 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- | 32 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- |
33 | src/corelib/global/qlibraryinfo.cpp | 3 ++- | 33 | src/corelib/global/qlibraryinfo.cpp | 3 ++- |
34 | src/corelib/global/qlibraryinfo.h | 1 + | 34 | src/corelib/global/qlibraryinfo.h | 1 + |
35 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- | 35 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- |
36 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- | 36 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- |
37 | tools/configure/configureapp.cpp | 8 ++++++++ | 37 | tools/configure/configureapp.cpp | 8 ++++++++ |
38 | 11 files changed, 51 insertions(+), 13 deletions(-) | 38 | 11 files changed, 50 insertions(+), 13 deletions(-) |
39 | 39 | ||
40 | diff --git a/configure b/configure | 40 | diff --git a/configure b/configure |
41 | index 3f7b41b..18d1a0b 100755 | 41 | index b7a6fe3..d715f6c 100755 |
42 | --- a/configure | 42 | --- a/configure |
43 | +++ b/configure | 43 | +++ b/configure |
44 | @@ -777,6 +777,7 @@ QT_HOST_BINS= | 44 | @@ -769,6 +769,7 @@ QT_HOST_BINS= |
45 | QT_HOST_LIBS= | 45 | QT_HOST_LIBS= |
46 | QT_HOST_DATA= | 46 | QT_HOST_DATA= |
47 | QT_EXT_PREFIX= | 47 | QT_EXT_PREFIX= |
@@ -49,7 +49,7 @@ index 3f7b41b..18d1a0b 100755 | |||
49 | 49 | ||
50 | #flags for SQL drivers | 50 | #flags for SQL drivers |
51 | QT_CFLAGS_PSQL= | 51 | QT_CFLAGS_PSQL= |
52 | @@ -896,6 +897,7 @@ while [ "$#" -gt 0 ]; do | 52 | @@ -888,6 +889,7 @@ while [ "$#" -gt 0 ]; do |
53 | -testsdir| \ | 53 | -testsdir| \ |
54 | -hostdatadir| \ | 54 | -hostdatadir| \ |
55 | -hostbindir| \ | 55 | -hostbindir| \ |
@@ -57,7 +57,7 @@ index 3f7b41b..18d1a0b 100755 | |||
57 | -hostlibdir| \ | 57 | -hostlibdir| \ |
58 | -extprefix| \ | 58 | -extprefix| \ |
59 | -sysroot| \ | 59 | -sysroot| \ |
60 | @@ -1110,6 +1112,9 @@ while [ "$#" -gt 0 ]; do | 60 | @@ -1102,6 +1104,9 @@ while [ "$#" -gt 0 ]; do |
61 | extprefix) | 61 | extprefix) |
62 | QT_EXT_PREFIX="$VAL" | 62 | QT_EXT_PREFIX="$VAL" |
63 | ;; | 63 | ;; |
@@ -67,7 +67,7 @@ index 3f7b41b..18d1a0b 100755 | |||
67 | pkg-config) | 67 | pkg-config) |
68 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 68 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
69 | CFG_PKGCONFIG="$VAL" | 69 | CFG_PKGCONFIG="$VAL" |
70 | @@ -2248,6 +2253,10 @@ Installation options: | 70 | @@ -2265,6 +2270,10 @@ Installation options: |
71 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 71 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
72 | (default HOSTPREFIX) | 72 | (default HOSTPREFIX) |
73 | 73 | ||
@@ -78,7 +78,7 @@ index 3f7b41b..18d1a0b 100755 | |||
78 | Configure options: | 78 | Configure options: |
79 | 79 | ||
80 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 80 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
81 | @@ -2915,6 +2924,11 @@ fi | 81 | @@ -2944,6 +2953,11 @@ fi |
82 | # command line and environment validation | 82 | # command line and environment validation |
83 | #------------------------------------------------------------------------------- | 83 | #------------------------------------------------------------------------------- |
84 | 84 | ||
@@ -90,7 +90,7 @@ index 3f7b41b..18d1a0b 100755 | |||
90 | # update QT_CONFIG to show our current predefined configuration | 90 | # update QT_CONFIG to show our current predefined configuration |
91 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 91 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
92 | case "$CFG_QCONFIG" in | 92 | case "$CFG_QCONFIG" in |
93 | @@ -3595,6 +3609,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { | 93 | @@ -3644,6 +3658,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { |
94 | "qt_hbinpath=$QT_HOST_BINS", | 94 | "qt_hbinpath=$QT_HOST_BINS", |
95 | "qt_hlibpath=$QT_HOST_LIBS", | 95 | "qt_hlibpath=$QT_HOST_LIBS", |
96 | "qt_hdatpath=$QT_HOST_DATA", | 96 | "qt_hdatpath=$QT_HOST_DATA", |
@@ -99,10 +99,10 @@ index 3f7b41b..18d1a0b 100755 | |||
99 | "qt_hostspec=$shortspec", | 99 | "qt_hostspec=$shortspec", |
100 | #endif | 100 | #endif |
101 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 101 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
102 | index 9a4d80e..dfc1cff 100644 | 102 | index a9a622d..b6f1db0 100644 |
103 | --- a/mkspecs/features/qt_functions.prf | 103 | --- a/mkspecs/features/qt_functions.prf |
104 | +++ b/mkspecs/features/qt_functions.prf | 104 | +++ b/mkspecs/features/qt_functions.prf |
105 | @@ -193,7 +193,11 @@ defineTest(qtAddRpathLink) { | 105 | @@ -191,7 +191,11 @@ defineTest(qtAddRpathLink) { |
106 | defineTest(qtPrepareTool) { | 106 | defineTest(qtPrepareTool) { |
107 | cmd = $$eval(QT_TOOL.$${2}.binary) | 107 | cmd = $$eval(QT_TOOL.$${2}.binary) |
108 | isEmpty(cmd) { | 108 | isEmpty(cmd) { |
@@ -134,10 +134,10 @@ index 1d3e88c..9b26adf 100644 | |||
134 | 134 | ||
135 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) | 135 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) |
136 | diff --git a/qmake/property.cpp b/qmake/property.cpp | 136 | diff --git a/qmake/property.cpp b/qmake/property.cpp |
137 | index e50485c..71291ad 100644 | 137 | index 051e056..50da6ed 100644 |
138 | --- a/qmake/property.cpp | 138 | --- a/qmake/property.cpp |
139 | +++ b/qmake/property.cpp | 139 | +++ b/qmake/property.cpp |
140 | @@ -75,6 +75,7 @@ static const struct { | 140 | @@ -67,6 +67,7 @@ static const struct { |
141 | { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, | 141 | { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, |
142 | { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, | 142 | { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, |
143 | { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, | 143 | { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, |
@@ -146,7 +146,7 @@ index e50485c..71291ad 100644 | |||
146 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, | 146 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, |
147 | }; | 147 | }; |
148 | diff --git a/qtbase.pro b/qtbase.pro | 148 | diff --git a/qtbase.pro b/qtbase.pro |
149 | index d6861cf..7fb58a3 100644 | 149 | index 6d0de44..ddf7478 100644 |
150 | --- a/qtbase.pro | 150 | --- a/qtbase.pro |
151 | +++ b/qtbase.pro | 151 | +++ b/qtbase.pro |
152 | @@ -69,18 +69,25 @@ CONFIG -= qt | 152 | @@ -69,18 +69,25 @@ CONFIG -= qt |
@@ -210,10 +210,10 @@ index 9bda70e..6e3605a 100644 | |||
210 | _qt5_Core_check_file_exists(${imported_location}) | 210 | _qt5_Core_check_file_exists(${imported_location}) |
211 | 211 | ||
212 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 212 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
213 | index 69e614f..a95ca35 100644 | 213 | index d68c51b..7191159 100644 |
214 | --- a/src/corelib/global/qlibraryinfo.cpp | 214 | --- a/src/corelib/global/qlibraryinfo.cpp |
215 | +++ b/src/corelib/global/qlibraryinfo.cpp | 215 | +++ b/src/corelib/global/qlibraryinfo.cpp |
216 | @@ -336,7 +336,7 @@ QLibraryInfo::isDebugBuild() | 216 | @@ -349,7 +349,7 @@ QLibraryInfo::isDebugBuild() |
217 | */ | 217 | */ |
218 | 218 | ||
219 | static const struct { | 219 | static const struct { |
@@ -222,7 +222,7 @@ index 69e614f..a95ca35 100644 | |||
222 | } qtConfEntries[] = { | 222 | } qtConfEntries[] = { |
223 | { "Prefix", "." }, | 223 | { "Prefix", "." }, |
224 | { "Documentation", "doc" }, // should be ${Data}/doc | 224 | { "Documentation", "doc" }, // should be ${Data}/doc |
225 | @@ -362,6 +362,7 @@ static const struct { | 225 | @@ -375,6 +375,7 @@ static const struct { |
226 | { "HostBinaries", "bin" }, | 226 | { "HostBinaries", "bin" }, |
227 | { "HostLibraries", "lib" }, | 227 | { "HostLibraries", "lib" }, |
228 | { "HostData", "." }, | 228 | { "HostData", "." }, |
@@ -231,10 +231,10 @@ index 69e614f..a95ca35 100644 | |||
231 | { "HostSpec", "" }, | 231 | { "HostSpec", "" }, |
232 | #endif | 232 | #endif |
233 | diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h | 233 | diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h |
234 | index 0b573c2..b5535ee 100644 | 234 | index 543c4b3..a02e03a 100644 |
235 | --- a/src/corelib/global/qlibraryinfo.h | 235 | --- a/src/corelib/global/qlibraryinfo.h |
236 | +++ b/src/corelib/global/qlibraryinfo.h | 236 | +++ b/src/corelib/global/qlibraryinfo.h |
237 | @@ -88,6 +88,7 @@ public: | 237 | @@ -80,6 +80,7 @@ public: |
238 | HostBinariesPath, | 238 | HostBinariesPath, |
239 | HostLibrariesPath, | 239 | HostLibrariesPath, |
240 | HostDataPath, | 240 | HostDataPath, |
@@ -278,10 +278,10 @@ index 99d87e2..5621dc0 100644 | |||
278 | _qt5_Widgets_check_file_exists(${imported_location}) | 278 | _qt5_Widgets_check_file_exists(${imported_location}) |
279 | 279 | ||
280 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 280 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
281 | index 90981f6..7d73882 100644 | 281 | index 92422c2..d0a62c8 100644 |
282 | --- a/tools/configure/configureapp.cpp | 282 | --- a/tools/configure/configureapp.cpp |
283 | +++ b/tools/configure/configureapp.cpp | 283 | +++ b/tools/configure/configureapp.cpp |
284 | @@ -1215,6 +1215,13 @@ void Configure::parseCmdLine() | 284 | @@ -1191,6 +1191,13 @@ void Configure::parseCmdLine() |
285 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); | 285 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); |
286 | } | 286 | } |
287 | 287 | ||
@@ -295,7 +295,7 @@ index 90981f6..7d73882 100644 | |||
295 | else if (configCmdLine.at(i) == "-make-tool") { | 295 | else if (configCmdLine.at(i) == "-make-tool") { |
296 | ++i; | 296 | ++i; |
297 | if (i == argCount) | 297 | if (i == argCount) |
298 | @@ -4006,6 +4013,7 @@ void Configure::generateQConfigCpp() | 298 | @@ -3995,6 +4002,7 @@ void Configure::generateQConfigCpp() |
299 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl | 299 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl |
300 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl | 300 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl |
301 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl | 301 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl |
@@ -304,5 +304,5 @@ index 90981f6..7d73882 100644 | |||
304 | << " \"qt_hostspec=" << hostSpec << "\"," << endl | 304 | << " \"qt_hostspec=" << hostSpec << "\"," << endl |
305 | << "#endif" << endl | 305 | << "#endif" << endl |
306 | -- | 306 | -- |
307 | 2.1.1 | 307 | 2.1.3 |
308 | 308 | ||