summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
diff options
context:
space:
mode:
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.patch13
1 files changed, 5 insertions, 8 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 f7feaeca..ca271e6c 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 @@
1From 8bc74542bab1f29dfb4a0e5a2af2f8d91f049579 Mon Sep 17 00:00:00 2001 1From 3ecdcb6a10d125f1440c42ad9c79f04d43c257e0 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/10] Add -external-hostbindir option 4Subject: [PATCH] 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
@@ -37,7 +37,7 @@ Conflicts:
37 7 files changed, 38 insertions(+), 12 deletions(-) 37 7 files changed, 38 insertions(+), 12 deletions(-)
38 38
39diff --git a/configure b/configure 39diff --git a/configure b/configure
40index 011cd70..d30b6e5 100755 40index 88a308d..f2611ed 100755
41--- a/configure 41--- a/configure
42+++ b/configure 42+++ b/configure
43@@ -810,6 +810,7 @@ QT_HOST_BINS= 43@@ -810,6 +810,7 @@ QT_HOST_BINS=
@@ -90,10 +90,10 @@ index 011cd70..d30b6e5 100755
90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h 90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
91 case "$CFG_QCONFIG" in 91 case "$CFG_QCONFIG" in
92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
93index b2c2507..fba4a58 100644 93index 8639695..d89d948 100644
94--- a/mkspecs/features/qt_functions.prf 94--- a/mkspecs/features/qt_functions.prf
95+++ b/mkspecs/features/qt_functions.prf 95+++ b/mkspecs/features/qt_functions.prf
96@@ -57,7 +57,11 @@ defineTest(qtHaveModule) { 96@@ -70,7 +70,11 @@ defineTest(qtHaveModule) {
97 defineTest(qtPrepareTool) { 97 defineTest(qtPrepareTool) {
98 cmd = $$eval(QT_TOOL.$${2}.binary) 98 cmd = $$eval(QT_TOOL.$${2}.binary)
99 isEmpty(cmd) { 99 isEmpty(cmd) {
@@ -224,6 +224,3 @@ index 99d87e2..5621dc0 100644
224 !!ENDIF 224 !!ENDIF
225 _qt5_Widgets_check_file_exists(${imported_location}) 225 _qt5_Widgets_check_file_exists(${imported_location})
226 226
227--
2282.7.1
229