From 06c25e6a6b9ff6f36f91412b2f8e10e8cd39bf3b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 4 Jun 2014 16:50:53 +0200 Subject: qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5 * move more patches to "shared" section Signed-off-by: Martin Jansa --- .../0003-Add-external-hostbindir-option.patch | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch') 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 7e03f740..f8253ecf 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 @@ -From 3648eeddaed0cf31fba226ec713d2321f398974f Mon Sep 17 00:00:00 2001 +From 5c2a17167e89f8f6cf26cbc289e57fa466678d2d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/14] Add -external-hostbindir option +Subject: [PATCH 03/17] 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 @@ -28,10 +28,10 @@ Signed-off-by: Martin Jansa 8 files changed, 45 insertions(+), 7 deletions(-) diff --git a/configure b/configure -index 0e74f29..7f3f2f0 100755 +index eaa4092..43ad8df 100755 --- a/configure +++ b/configure -@@ -788,6 +788,7 @@ QT_HOST_BINS= +@@ -791,6 +791,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX= @@ -39,7 +39,7 @@ index 0e74f29..7f3f2f0 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -907,6 +908,7 @@ while [ "$#" -gt 0 ]; do +@@ -910,6 +911,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \ @@ -47,7 +47,7 @@ index 0e74f29..7f3f2f0 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1120,6 +1122,9 @@ while [ "$#" -gt 0 ]; do +@@ -1124,6 +1126,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;; @@ -57,7 +57,7 @@ index 0e74f29..7f3f2f0 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2236,6 +2241,10 @@ Installation options: +@@ -2248,6 +2253,10 @@ Installation options: -hostdatadir . Data used by qmake will be installed to (default HOSTPREFIX) @@ -68,7 +68,7 @@ index 0e74f29..7f3f2f0 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3151,6 +3160,11 @@ fi +@@ -2906,6 +2915,11 @@ fi # command line and environment validation #------------------------------------------------------------------------------- @@ -80,7 +80,7 @@ index 0e74f29..7f3f2f0 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 -@@ -3838,6 +3852,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { +@@ -3593,6 +3607,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", @@ -135,10 +135,10 @@ index e50485c..71291ad 100644 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/qtbase.pro b/qtbase.pro -index 140a137..4e01d5b 100644 +index ed6fc39..2421f41 100644 --- a/qtbase.pro +++ b/qtbase.pro -@@ -70,16 +70,22 @@ CONFIG -= qt +@@ -71,16 +71,22 @@ CONFIG -= qt #qmake qmake.path = $$[QT_HOST_BINS] @@ -165,10 +165,10 @@ index 140a137..4e01d5b 100644 # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index c647a16..da82913 100644 +index 80e0f30..89e13cf 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -281,7 +281,7 @@ QLibraryInfo::isDebugBuild() +@@ -336,7 +336,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -177,7 +177,7 @@ index c647a16..da82913 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -307,6 +307,7 @@ static const struct { +@@ -362,6 +362,7 @@ static const struct { { "HostBinaries", "bin" }, { "HostLibraries", "lib" }, { "HostData", "." }, @@ -186,10 +186,10 @@ index c647a16..da82913 100644 { "HostSpec", "" }, #endif diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h -index 17864b5..a14bc0f 100644 +index 0b573c2..b5535ee 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h -@@ -84,6 +84,7 @@ public: +@@ -88,6 +88,7 @@ public: HostBinariesPath, HostLibrariesPath, HostDataPath, @@ -198,10 +198,10 @@ index 17864b5..a14bc0f 100644 HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 5ab413a..50a192b 100644 +index fe2caa2..eb472db 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1186,6 +1186,13 @@ void Configure::parseCmdLine() +@@ -1208,6 +1208,13 @@ void Configure::parseCmdLine() dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); } @@ -215,7 +215,7 @@ index 5ab413a..50a192b 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3852,6 +3859,7 @@ void Configure::generateQConfigCpp() +@@ -3957,6 +3964,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 @@ -224,5 +224,5 @@ index 5ab413a..50a192b 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.8.5.3 +2.0.0 -- cgit v1.2.3-54-g00ecf