diff options
author | Koen Kooi <koen@openembedded.org> | 2010-02-10 11:32:28 +0100 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2010-02-14 11:28:40 +0100 |
commit | 3d45480a1cf1ac4d554434699365306c7f09c6cc (patch) | |
tree | 457e6afb85f4e7b1a25e8c4b72f1a060c5766a4e /recipes/qmake/files | |
parent | b6a63dbf5a87845bab6ce774277bc3287b4d9a89 (diff) |
qmake2: convert native and sdk to use BBCLASS_EXTEND and new-style staging
Diffstat (limited to 'recipes/qmake/files')
-rw-r--r-- | recipes/qmake/files/qmake-hack.diff | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/recipes/qmake/files/qmake-hack.diff b/recipes/qmake/files/qmake-hack.diff new file mode 100644 index 0000000000..290f54052b --- /dev/null +++ b/recipes/qmake/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 + + #------------------------------------------------------------------------------- |