aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase/0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
new file mode 100644
index 00000000..71457966
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -0,0 +1,50 @@
+From bb0958af49c1ad4d35b6b6b9033cd46eda4a3ac8 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 29 Oct 2012 20:07:49 -0700
+Subject: [PATCH 12/12] qmake: don't build it in configure, but allow to build
+ it separately
+
+* it is already built in qtbase-native, so we don't need it in configure
+* allow building a separate qmake for the target
+
+Upstream-Status: Inappropriate [configuration]
+ OE specific for native/target builds
+
+Signed-off-by: Yu Ke <ke.yu@intel.com>
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 +-
+ qmake/qmake.pro | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index ca0824f..5a09ae3 100755
+--- a/configure
++++ b/configure
+@@ -3675,7 +3675,7 @@ setBootstrapEvalVariable()
+
+
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+ echo "Creating qmake..."
+
+ mkdir -p "$outpath/qmake" || exit
+diff --git a/qmake/qmake.pro b/qmake/qmake.pro
+index 89d6ea5..7c605b9 100644
+--- a/qmake/qmake.pro
++++ b/qmake/qmake.pro
+@@ -8,6 +8,8 @@ CONFIG -= qt
+ DEFINES += \
+ QT_BUILD_QMAKE \
+ PROEVALUATOR_FULL
++DESTDIR = ../bin/
++TARGET = qmake
+
+ VPATH += \
+ ../src/corelib/global \
+--
+2.1.1
+