From 0a88f92505f27944e985c9f54e64c04b082778fb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 14:15:13 +0200 Subject: qtbase: refresh patches and add missing to 5.0.2 and git versions --- .../qtbase-git/0003-Add-external-hostbindir-option.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch') 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 b99eb1cf..e1c56ac3 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 e8fe1934151a47fd3ec86fb0054e137237fa69b7 Mon Sep 17 00:00:00 2001 +From c244c6a89f6f70a2443748475f482cc97e3ac118 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 3/6] 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 @@ -21,7 +21,7 @@ Signed-off-by: Martin Jansa 8 files changed, 42 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index 666576f..93dbfab 100755 +index 7dea731..65f4d26 100755 --- a/configure +++ b/configure @@ -1034,6 +1034,7 @@ CFG_GCC_SYSROOT="yes" @@ -98,10 +98,10 @@ index 8cd2473..876f657 100644 exists($$eval($$1).bat) { $$1 = $$eval($$1).bat diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 46d031f..5758604 100644 +index 0a58880..c110ea5 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf -@@ -37,7 +37,7 @@ load(qt_common) +@@ -16,7 +16,7 @@ CONFIG += console # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to work with the non-installed build. # Non-bootstrapped tools always need this because of the environment setup. @@ -189,10 +189,10 @@ index 1a00a14..7e4829c 100644 HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index dc11c0d..6d79631 100644 +index a18aac3..57409b1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1167,6 +1167,13 @@ void Configure::parseCmdLine() +@@ -1173,6 +1173,13 @@ void Configure::parseCmdLine() dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i); } @@ -206,7 +206,7 @@ index dc11c0d..6d79631 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3763,6 +3770,7 @@ void Configure::generateQConfigCpp() +@@ -3775,6 +3782,7 @@ void Configure::generateQConfigCpp() << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl -- cgit v1.2.3-54-g00ecf