From 0733f7a4a948d23afb87a8dc1acf8327c0e91aa0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 9 Feb 2012 17:38:21 +0000 Subject: qt4-tools-nativesdk: improve and tidy up qmake build * Use the same method to build qmake as in the qt4 target recipes * We always have qmake from qt4-native so don't check if it exists - just skip the check like we do in the qt4 target recipes. This saves us a patch. * Replace qt4-tools-native in DEPENDS with qt4-native (From OE-Core rev: 71153270466352245fe2aa3318bbabb1f8062ed2) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/files/qmake-exists-check.patch | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 meta/recipes-qt/qt4/files/qmake-exists-check.patch (limited to 'meta/recipes-qt/qt4/files/qmake-exists-check.patch') diff --git a/meta/recipes-qt/qt4/files/qmake-exists-check.patch b/meta/recipes-qt/qt4/files/qmake-exists-check.patch deleted file mode 100644 index 27d21e045b..0000000000 --- a/meta/recipes-qt/qt4/files/qmake-exists-check.patch +++ /dev/null @@ -1,19 +0,0 @@ -qt4-tools-nativesdk: avoid rebuilding qmake - -qt4-tools-nativesdk patch to avoids building qmake in configure if it already exists -(as it will, since we symlink it in from the native sysroot in do_configure) - -Signed-off-by: Paul Eggleton -Upstream-Status: Inappropriate [configuration] - ---- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000 -+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000 -@@ -4286,7 +4286,7 @@ - } - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if [ '!' -f "$outpath/bin/qmake" ]; then - echo "Creating qmake. Please wait..." - - OLD_QCONFIG_H= -- cgit v1.2.3-54-g00ecf