diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-06-13 15:46:52 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-19 19:25:25 +0200 |
| commit | 608afbe8283c111964bef1246854edfd89ccee75 (patch) | |
| tree | 4703da59836cebbf2168f2696e8fb38c44bf722e /meta-oe/recipes-qt/qt4/qmake2/qmake-hack.diff | |
| parent | 4c3feb6a4fba60771891c857ff946c9eaadba9ea (diff) | |
| download | meta-openembedded-608afbe8283c111964bef1246854edfd89ccee75.tar.gz | |
qt4: replace recipes with bbappends
The only functional difference between these recipes and the ones in
oe-core is the addition of PostgreSQL, MySQL and SQLite 2 drivers. Now
that we have QT_SQL_DRIVER_FLAGS in the oe-core Qt4 recipes we can
replace the overlayed recipes with bbappends which enable the drivers
using this variable.
(Note: there is no bbappend for qt4-tools-native as this does not build
the SQL drivers.)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-qt/qt4/qmake2/qmake-hack.diff')
| -rw-r--r-- | meta-oe/recipes-qt/qt4/qmake2/qmake-hack.diff | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/meta-oe/recipes-qt/qt4/qmake2/qmake-hack.diff b/meta-oe/recipes-qt/qt4/qmake2/qmake-hack.diff new file mode 100644 index 0000000000..290f54052b --- /dev/null +++ b/meta-oe/recipes-qt/qt4/qmake2/qmake-hack.diff | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | --- /tmp/configure 2010-02-10 15:41:58.000000000 +0100 | ||
| 2 | +++ qt-embedded-linux-opensource-src-4.4.3/configure 2010-02-10 15:42:01.000000000 +0100 | ||
| 3 | @@ -3946,6 +3946,12 @@ | ||
| 4 | [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake | ||
| 5 | [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h | ||
| 6 | [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 | ||
| 7 | + | ||
| 8 | +# OE | ||
| 9 | +if [ x$CROSSHACK = xtrue ] ; then | ||
| 10 | + echo "Exiting now, since we have what we want: a qmake binary" | ||
| 11 | + exit 0 | ||
| 12 | +fi | ||
| 13 | fi # Build qmake | ||
| 14 | |||
| 15 | #------------------------------------------------------------------------------- | ||
