diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-09 17:38:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:14:49 +0000 |
| commit | 71153270466352245fe2aa3318bbabb1f8062ed2 (patch) | |
| tree | 152164d0a47afd4fd2ed8d1352dffaaa5d5d01e9 /meta/recipes-qt/qt4/files | |
| parent | 0b948d20b835387702a4f5e103eaae5b4a330edd (diff) | |
| download | openembedded-core-71153270466352245fe2aa3318bbabb1f8062ed2.tar.gz openembedded-core-71153270466352245fe2aa3318bbabb1f8062ed2.tar.bz2 openembedded-core-71153270466352245fe2aa3318bbabb1f8062ed2.tar.xz openembedded-core-71153270466352245fe2aa3318bbabb1f8062ed2.zip | |
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
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/files')
| -rw-r--r-- | meta/recipes-qt/qt4/files/qmake-exists-check.patch | 19 |
1 files changed, 0 insertions, 19 deletions
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 27d21e045..000000000 --- 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 <paul.eggleton@linux.intel.com> -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= |