diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-29 05:37:20 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-04 04:23:53 +0200 |
commit | cfe122037d04fb78a8a21f7936e6822170916246 (patch) | |
tree | 286e3ec9aba1603aa77edbfde756998ef7798170 /recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |
parent | 3700c51c246f6aaf8ef6a3ce098578664873c096 (diff) | |
download | meta-qt5-cfe122037d04fb78a8a21f7936e6822170916246.tar.gz |
qt*: refresh the patches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 | 32 |
1 files changed, 16 insertions, 16 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 2abea8fc..d5df4f69 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 b544f5f3462e2981ada045a32038b7f116f8590c Mon Sep 17 00:00:00 2001 | 1 | From e263260c50051327e3f7f2ca8c46e014228e0078 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/12] Add -external-hostbindir option | 4 | Subject: [PATCH 03/13] 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 |
@@ -38,10 +38,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
38 | 11 files changed, 51 insertions(+), 13 deletions(-) | 38 | 11 files changed, 51 insertions(+), 13 deletions(-) |
39 | 39 | ||
40 | diff --git a/configure b/configure | 40 | diff --git a/configure b/configure |
41 | index d5c2b08..dcd066c 100755 | 41 | index 3f7b41b..18d1a0b 100755 |
42 | --- a/configure | 42 | --- a/configure |
43 | +++ b/configure | 43 | +++ b/configure |
44 | @@ -759,6 +759,7 @@ QT_HOST_BINS= | 44 | @@ -777,6 +777,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 d5c2b08..dcd066c 100755 | |||
49 | 49 | ||
50 | #flags for SQL drivers | 50 | #flags for SQL drivers |
51 | QT_CFLAGS_PSQL= | 51 | QT_CFLAGS_PSQL= |
52 | @@ -878,6 +879,7 @@ while [ "$#" -gt 0 ]; do | 52 | @@ -896,6 +897,7 @@ while [ "$#" -gt 0 ]; do |
53 | -testsdir| \ | 53 | -testsdir| \ |
54 | -hostdatadir| \ | 54 | -hostdatadir| \ |
55 | -hostbindir| \ | 55 | -hostbindir| \ |
@@ -57,7 +57,7 @@ index d5c2b08..dcd066c 100755 | |||
57 | -hostlibdir| \ | 57 | -hostlibdir| \ |
58 | -extprefix| \ | 58 | -extprefix| \ |
59 | -sysroot| \ | 59 | -sysroot| \ |
60 | @@ -1092,6 +1094,9 @@ while [ "$#" -gt 0 ]; do | 60 | @@ -1110,6 +1112,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 d5c2b08..dcd066c 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 | @@ -2230,6 +2235,10 @@ Installation options: | 70 | @@ -2248,6 +2253,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 d5c2b08..dcd066c 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 | @@ -2897,6 +2906,11 @@ fi | 81 | @@ -2915,6 +2924,11 @@ fi |
82 | # command line and environment validation | 82 | # command line and environment validation |
83 | #------------------------------------------------------------------------------- | 83 | #------------------------------------------------------------------------------- |
84 | 84 | ||
@@ -90,7 +90,7 @@ index d5c2b08..dcd066c 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 | @@ -3577,6 +3591,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { | 93 | @@ -3595,6 +3609,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", |
@@ -211,10 +211,10 @@ index 9bda70e..6e3605a 100644 | |||
211 | _qt5_Core_check_file_exists(${imported_location}) | 211 | _qt5_Core_check_file_exists(${imported_location}) |
212 | 212 | ||
213 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 213 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
214 | index 174c1d0..1fe03cb 100644 | 214 | index 69e614f..a95ca35 100644 |
215 | --- a/src/corelib/global/qlibraryinfo.cpp | 215 | --- a/src/corelib/global/qlibraryinfo.cpp |
216 | +++ b/src/corelib/global/qlibraryinfo.cpp | 216 | +++ b/src/corelib/global/qlibraryinfo.cpp |
217 | @@ -333,7 +333,7 @@ QLibraryInfo::isDebugBuild() | 217 | @@ -336,7 +336,7 @@ QLibraryInfo::isDebugBuild() |
218 | */ | 218 | */ |
219 | 219 | ||
220 | static const struct { | 220 | static const struct { |
@@ -223,7 +223,7 @@ index 174c1d0..1fe03cb 100644 | |||
223 | } qtConfEntries[] = { | 223 | } qtConfEntries[] = { |
224 | { "Prefix", "." }, | 224 | { "Prefix", "." }, |
225 | { "Documentation", "doc" }, // should be ${Data}/doc | 225 | { "Documentation", "doc" }, // should be ${Data}/doc |
226 | @@ -359,6 +359,7 @@ static const struct { | 226 | @@ -362,6 +362,7 @@ static const struct { |
227 | { "HostBinaries", "bin" }, | 227 | { "HostBinaries", "bin" }, |
228 | { "HostLibraries", "lib" }, | 228 | { "HostLibraries", "lib" }, |
229 | { "HostData", "." }, | 229 | { "HostData", "." }, |
@@ -279,10 +279,10 @@ index 99d87e2..5621dc0 100644 | |||
279 | _qt5_Widgets_check_file_exists(${imported_location}) | 279 | _qt5_Widgets_check_file_exists(${imported_location}) |
280 | 280 | ||
281 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 281 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
282 | index b756509..7e61845 100644 | 282 | index 90981f6..7d73882 100644 |
283 | --- a/tools/configure/configureapp.cpp | 283 | --- a/tools/configure/configureapp.cpp |
284 | +++ b/tools/configure/configureapp.cpp | 284 | +++ b/tools/configure/configureapp.cpp |
285 | @@ -1213,6 +1213,13 @@ void Configure::parseCmdLine() | 285 | @@ -1215,6 +1215,13 @@ void Configure::parseCmdLine() |
286 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); | 286 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); |
287 | } | 287 | } |
288 | 288 | ||
@@ -296,7 +296,7 @@ index b756509..7e61845 100644 | |||
296 | else if (configCmdLine.at(i) == "-make-tool") { | 296 | else if (configCmdLine.at(i) == "-make-tool") { |
297 | ++i; | 297 | ++i; |
298 | if (i == argCount) | 298 | if (i == argCount) |
299 | @@ -3983,6 +3990,7 @@ void Configure::generateQConfigCpp() | 299 | @@ -4006,6 +4013,7 @@ void Configure::generateQConfigCpp() |
300 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl | 300 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl |
301 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl | 301 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl |
302 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl | 302 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl |
@@ -305,5 +305,5 @@ index b756509..7e61845 100644 | |||
305 | << " \"qt_hostspec=" << hostSpec << "\"," << endl | 305 | << " \"qt_hostspec=" << hostSpec << "\"," << endl |
306 | << "#endif" << endl | 306 | << "#endif" << endl |
307 | -- | 307 | -- |
308 | 2.0.1 | 308 | 2.1.1 |
309 | 309 | ||