summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch')
-rw-r--r--recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch12
1 files changed, 7 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch
index e44d7381..cd63c449 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch
@@ -1,13 +1,15 @@
1From 79f1b015148779b92dc6e65dffd297b8b9522f79 Mon Sep 17 00:00:00 2001 1From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 03/11] Add -external-hostbindir option 4Subject: [PATCH 03/12] 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
8 8
9* this way we can skip bootstraping tools we already have 9* this way we can skip bootstraping tools we already have
10 10
11Upstream-Status: Pending
12
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12--- 14---
13 configure | 15 ++++++++++++++- 15 configure | 15 ++++++++++++++-
@@ -156,10 +158,10 @@ index 4c41cff..997ea6d 100644
156 158
157 # If we are doing a prefix build, create a "module" pri which enables 159 # If we are doing a prefix build, create a "module" pri which enables
158diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 160diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
159index acd11f5..bba0861 100644 161index 6b40731..139a60f 100644
160--- a/src/corelib/global/qlibraryinfo.cpp 162--- a/src/corelib/global/qlibraryinfo.cpp
161+++ b/src/corelib/global/qlibraryinfo.cpp 163+++ b/src/corelib/global/qlibraryinfo.cpp
162@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() 164@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
163 */ 165 */
164 166
165 static const struct { 167 static const struct {
@@ -168,7 +170,7 @@ index acd11f5..bba0861 100644
168 } qtConfEntries[] = { 170 } qtConfEntries[] = {
169 { "Prefix", "." }, 171 { "Prefix", "." },
170 { "Documentation", "doc" }, // should be ${Data}/doc 172 { "Documentation", "doc" }, // should be ${Data}/doc
171@@ -297,6 +297,7 @@ static const struct { 173@@ -295,6 +295,7 @@ static const struct {
172 { "HostPrefix", "" }, 174 { "HostPrefix", "" },
173 { "HostBinaries", "bin" }, 175 { "HostBinaries", "bin" },
174 { "HostData", "." }, 176 { "HostData", "." },