diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
| commit | c58cc7d3796dcee6e93885c835ed04cb566abeb2 (patch) | |
| tree | 3eea4d4ef6a4ef79e0f4e025d7012c1a5cc38835 /meta-oe/recipes-qt/qt4/files/qmake-hack.diff | |
| parent | eec6ab97f712e06eb52c9f7c99e19ffab3ce9d74 (diff) | |
| download | meta-openembedded-contrib-c58cc7d3796dcee6e93885c835ed04cb566abeb2.tar.gz | |
move layer into meta-oe in preparation for future splits
As per TSC decision
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-qt/qt4/files/qmake-hack.diff')
| -rw-r--r-- | meta-oe/recipes-qt/qt4/files/qmake-hack.diff | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/meta-oe/recipes-qt/qt4/files/qmake-hack.diff b/meta-oe/recipes-qt/qt4/files/qmake-hack.diff new file mode 100644 index 0000000000..290f54052b --- /dev/null +++ b/meta-oe/recipes-qt/qt4/files/qmake-hack.diff @@ -0,0 +1,15 @@ +--- /tmp/configure 2010-02-10 15:41:58.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.4.3/configure 2010-02-10 15:42:01.000000000 +0100 +@@ -3946,6 +3946,12 @@ + [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake + [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h + [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 ++ ++# OE ++if [ x$CROSSHACK = xtrue ] ; then ++ echo "Exiting now, since we have what we want: a qmake binary" ++ exit 0 ++fi + fi # Build qmake + + #------------------------------------------------------------------------------- |