diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-31 08:35:04 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-31 10:19:02 +0100 |
commit | 183ca02ebee6db8b7575057c48f8e965357eac59 (patch) | |
tree | d9135566cfdaa6b8c9c885c8c1b20fc397f99b4f /recipes-qt/qt4/files/qmake-exists-check.patch | |
parent | 453f31b13af76a4bfa534ab9fbe4795a10029b84 (diff) | |
download | meta-openembedded-183ca02ebee6db8b7575057c48f8e965357eac59.tar.gz |
qt4: sync with paule/qt-fixes3
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-qt/qt4/files/qmake-exists-check.patch')
-rw-r--r-- | recipes-qt/qt4/files/qmake-exists-check.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/recipes-qt/qt4/files/qmake-exists-check.patch b/recipes-qt/qt4/files/qmake-exists-check.patch new file mode 100644 index 0000000000..cc73837e53 --- /dev/null +++ b/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= | ||