diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch | 53 |
1 files changed, 23 insertions, 30 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch index 5f9fd90d..81f18674 100644 --- a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ -From 00ad866f82f89ce938e9eaabfc50af3cde72ccfe Mon Sep 17 00:00:00 2001 +From eaa4a4c13e65e29e2214a01b69b77b9c6f2ada05 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 02/10] Add -external-hostbindir option +Subject: [PATCH 2/8] Add -external-hostbindir option * when cross-compiling it's sometimes useful to use existing tools from machine (or in OpenEmbedded built with separate native recipe) when building for target @@ -24,7 +24,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Simon Busch <morphis@gravedo.de> --- configure | 15 +++++++++++++++ - mkspecs/features/qt_functions.prf | 9 ++++++++- + mkspecs/features/qt_functions.prf | 2 +- mkspecs/features/qt_tool.prf | 3 +-- qmake/property.cpp | 1 + qtbase.pro | 12 +++++++++--- @@ -34,10 +34,10 @@ Signed-off-by: Simon Busch <morphis@gravedo.de> src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- tools/configure/configureapp.cpp | 8 ++++++++ - 11 files changed, 51 insertions(+), 13 deletions(-) + 11 files changed, 44 insertions(+), 13 deletions(-) diff --git a/configure b/configure -index bb24a9c..bf7c11e 100755 +index 4eae0d3..48d5119 100755 --- a/configure +++ b/configure @@ -777,6 +777,7 @@ QT_HOST_BINS= @@ -48,7 +48,7 @@ index bb24a9c..bf7c11e 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -898,6 +899,7 @@ while [ "$#" -gt 0 ]; do +@@ -896,6 +897,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \ @@ -56,7 +56,7 @@ index bb24a9c..bf7c11e 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1112,6 +1114,9 @@ while [ "$#" -gt 0 ]; do +@@ -1110,6 +1112,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;; @@ -66,7 +66,7 @@ index bb24a9c..bf7c11e 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2250,6 +2255,10 @@ Installation options: +@@ -2248,6 +2253,10 @@ Installation options: -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX) @@ -77,7 +77,7 @@ index bb24a9c..bf7c11e 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -2914,6 +2923,11 @@ fi +@@ -2915,6 +2924,11 @@ fi # command line and environment validation #------------------------------------------------------------------------------- @@ -89,7 +89,7 @@ index bb24a9c..bf7c11e 100755 # update QT_CONFIG to show our current predefined configuration CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h case "$CFG_QCONFIG" in -@@ -3594,6 +3608,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { +@@ -3595,6 +3609,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_hbinpath=$QT_HOST_BINS", "qt_hlibpath=$QT_HOST_LIBS", "qt_hdatpath=$QT_HOST_DATA", @@ -98,27 +98,20 @@ index bb24a9c..bf7c11e 100755 "qt_hostspec=$shortspec", #endif diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1dacfed..7229845 100644 +index d41fe3b..050a4a7 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) { +@@ -193,7 +193,7 @@ defineTest(qtAddRpathLink) { defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.binary) - isEmpty($$1) { -- $$1 = $$[QT_HOST_BINS]/$$2 -+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -+ # for some reason isEmpty does not work here, FIXME before submitting upstream -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch -+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { -+ $$1 = $$[QT_HOST_BINS]/$$2 -+ } - exists($$eval($$1).pl) { - $$1 = perl -w $$eval($$1).pl + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2 + exists($${cmd}.pl) { + cmd = perl -w $$system_path($${cmd}.pl) } else: contains(QMAKE_HOST.os, Windows) { diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index f0864f9..50bfac8 100644 +index 1d3e88c..bd44754 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -15,8 +15,7 @@ CONFIG += console @@ -144,7 +137,7 @@ index e50485c..71291ad 100644 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/qtbase.pro b/qtbase.pro -index ed6fc39..2421f41 100644 +index d6861cf..92e6a83 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -71,16 +71,22 @@ CONFIG -= qt @@ -273,7 +266,7 @@ index 99d87e2..5621dc0 100644 _qt5_Widgets_check_file_exists(${imported_location}) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index cff3f1b..540708b 100644 +index b756509..7e61845 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1213,6 +1213,13 @@ void Configure::parseCmdLine() @@ -290,7 +283,7 @@ index cff3f1b..540708b 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3986,6 +3993,7 @@ void Configure::generateQConfigCpp() +@@ -3983,6 +3990,7 @@ void Configure::generateQConfigCpp() << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl @@ -299,5 +292,5 @@ index cff3f1b..540708b 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.9.1 +2.0.0 |