2014-02-07 03:10:06 +00:00
|
|
|
From 441b2ebc41013505b9f5b6a4db43526506f84e47 Mon Sep 17 00:00:00 2001
|
2013-11-26 01:47:57 +00:00
|
|
|
From: Denys Dmytriyenko <denys@ti.com>
|
|
|
|
Date: Mon, 11 Nov 2013 20:22:34 -0500
|
2013-11-02 18:06:14 +00:00
|
|
|
Subject: [PATCH 11/12] configure: preserve built qmake and swap with native
|
|
|
|
one
|
2013-11-26 01:47:57 +00:00
|
|
|
|
|
|
|
Let configure script build the real qmake, but right after it's built, swap
|
|
|
|
it with a native qmake for further internal use, preserving the real one.
|
|
|
|
|
|
|
|
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
|
|
|
|
---
|
|
|
|
configure | 2 ++
|
|
|
|
1 file changed, 2 insertions(+)
|
|
|
|
|
|
|
|
diff --git a/configure b/configure
|
2014-02-07 03:10:06 +00:00
|
|
|
index 66c2ae0..d423cce 100755
|
2013-11-26 01:47:57 +00:00
|
|
|
--- a/configure
|
|
|
|
+++ b/configure
|
2014-02-07 03:10:06 +00:00
|
|
|
@@ -4085,6 +4085,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
2013-11-26 01:47:57 +00:00
|
|
|
|
|
|
|
(cd "$outpath/qmake"; "$MAKE") || exit 2
|
|
|
|
fi # Build qmake
|
|
|
|
+mv "$outpath/bin/qmake" "$outpath/bin/qmake-real"
|
|
|
|
+mv "$outpath/bin/qmake-native" "$outpath/bin/qmake"
|
|
|
|
|
|
|
|
echo "Running configuration tests..."
|
|
|
|
|
|
|
|
--
|
2014-02-07 03:10:06 +00:00
|
|
|
1.8.5.3
|
2013-11-26 01:47:57 +00:00
|
|
|
|