diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-01-14 12:02:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 16:25:11 +0000 |
commit | 7a0c927c99a540dd2bbdc3f614d57904abb487cb (patch) | |
tree | 943aad5eb675adb28842dc5da9819836ae1322f6 /meta/recipes-qt/qt4/files/qmake-exists-check.patch | |
parent | 0e6608ba8810c1062c569a8c94aae7e4cba99f09 (diff) | |
download | poky-7a0c927c99a540dd2bbdc3f614d57904abb487cb.tar.gz |
qt4: Add qt4-tools-nativesdk based on qt4-tools-sdk from OpenEmbedded
Differences from OpenEmbedded qt4-tools-sdk:
* Convert to nativesdk and make fixes necessary to build
* Use .inc file in 4.6.3 version
* Add LIC_FILES_CHKSUM
* Fix LICENSE to match other Qt4 recipes
* Use http source URL to match other Qt4 recipes
* Whitespace fixes
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/files/qmake-exists-check.patch')
-rw-r--r-- | meta/recipes-qt/qt4/files/qmake-exists-check.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/files/qmake-exists-check.patch b/meta/recipes-qt/qt4/files/qmake-exists-check.patch new file mode 100644 index 0000000000..cc73837e53 --- /dev/null +++ b/meta/recipes-qt/qt4/files/qmake-exists-check.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | qt4-tools-nativesdk: avoid rebuilding qmake | ||
2 | |||
3 | qt4-tools-nativesdk patch to avoids building qmake in configure if it already exists | ||
4 | (as it will, since we symlink it in from the native sysroot in do_configure) | ||
5 | |||
6 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
7 | |||
8 | --- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000 | ||
9 | +++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000 | ||
10 | @@ -4286,7 +4286,7 @@ | ||
11 | } | ||
12 | |||
13 | # build qmake | ||
14 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
15 | +if [ '!' -f "$outpath/bin/qmake" ]; then | ||
16 | echo "Creating qmake. Please wait..." | ||
17 | |||
18 | OLD_QCONFIG_H= | ||