diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index 2abea8fc..88bb4841 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ -From b544f5f3462e2981ada045a32038b7f116f8590c Mon Sep 17 00:00:00 2001 +From 735d4f58381452854ed7b0c2f762030d747098e1 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 03/12] Add -external-hostbindir option +Subject: [PATCH 03/11] 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 @@ -38,10 +38,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> 11 files changed, 51 insertions(+), 13 deletions(-) diff --git a/configure b/configure -index d5c2b08..dcd066c 100755 +index b1dfca9..dcd1790 100755 --- a/configure +++ b/configure -@@ -759,6 +759,7 @@ QT_HOST_BINS= +@@ -768,6 +768,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX= @@ -49,7 +49,7 @@ index d5c2b08..dcd066c 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -878,6 +879,7 @@ while [ "$#" -gt 0 ]; do +@@ -887,6 +888,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \ @@ -57,7 +57,7 @@ index d5c2b08..dcd066c 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1092,6 +1094,9 @@ while [ "$#" -gt 0 ]; do +@@ -1101,6 +1103,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;; @@ -67,7 +67,7 @@ index d5c2b08..dcd066c 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2230,6 +2235,10 @@ Installation options: +@@ -2252,6 +2257,10 @@ Installation options: -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX) @@ -78,7 +78,7 @@ index d5c2b08..dcd066c 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -2897,6 +2906,11 @@ fi +@@ -2916,6 +2925,11 @@ fi # command line and environment validation #------------------------------------------------------------------------------- @@ -90,7 +90,7 @@ index d5c2b08..dcd066c 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 -@@ -3577,6 +3591,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { +@@ -3609,6 +3623,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", @@ -99,10 +99,10 @@ index d5c2b08..dcd066c 100755 "qt_hostspec=$shortspec", #endif diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 9a4d80e..dfc1cff 100644 +index 709248a..ea2fed0 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -193,7 +193,11 @@ defineTest(qtAddRpathLink) { +@@ -191,7 +191,11 @@ defineTest(qtAddRpathLink) { defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -134,10 +134,10 @@ index 1d3e88c..9b26adf 100644 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) diff --git a/qmake/property.cpp b/qmake/property.cpp -index e50485c..71291ad 100644 +index 051e056..50da6ed 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp -@@ -75,6 +75,7 @@ static const struct { +@@ -67,6 +67,7 @@ static const struct { { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, @@ -211,10 +211,10 @@ index 9bda70e..6e3605a 100644 _qt5_Core_check_file_exists(${imported_location}) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 174c1d0..1fe03cb 100644 +index 1be2659..6c3718a 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -333,7 +333,7 @@ QLibraryInfo::isDebugBuild() +@@ -357,7 +357,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -223,7 +223,7 @@ index 174c1d0..1fe03cb 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -359,6 +359,7 @@ static const struct { +@@ -383,6 +383,7 @@ static const struct { { "HostBinaries", "bin" }, { "HostLibraries", "lib" }, { "HostData", "." }, @@ -232,10 +232,10 @@ index 174c1d0..1fe03cb 100644 { "HostSpec", "" }, #endif diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h -index 0b573c2..b5535ee 100644 +index 543c4b3..a02e03a 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h -@@ -88,6 +88,7 @@ public: +@@ -80,6 +80,7 @@ public: HostBinariesPath, HostLibrariesPath, HostDataPath, @@ -279,10 +279,10 @@ index 99d87e2..5621dc0 100644 _qt5_Widgets_check_file_exists(${imported_location}) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index b756509..7e61845 100644 +index ef71097..7969132 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1213,6 +1213,13 @@ void Configure::parseCmdLine() +@@ -1191,6 +1191,13 @@ void Configure::parseCmdLine() dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); } @@ -296,7 +296,7 @@ index b756509..7e61845 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3983,6 +3990,7 @@ void Configure::generateQConfigCpp() +@@ -3984,6 +3991,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 @@ -305,5 +305,5 @@ index b756509..7e61845 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -2.0.1 +2.1.1 |