diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 16:56:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-25 14:24:08 +0200 |
commit | 8f765ed71128ecc50aa7cd464be1332658df6e10 (patch) | |
tree | 14b6c80191dbd1a7c5ac9d22d1642e4ae0c5e276 /recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch | |
parent | 52496ed3e2ec94d1d93426a766ec93ab400bc1df (diff) | |
download | meta-qt5-8f765ed71128ecc50aa7cd464be1332658df6e10.tar.gz |
qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch new file mode 100644 index 00000000..9a8ddbbf --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 706d9a8b270d5eb803e93005cc90a1aa1553572a Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Dmytriyenko <denys@ti.com> | ||
3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 | ||
4 | Subject: [PATCH 10/10] configure: preserve built qmake and swap with native | ||
5 | one | ||
6 | |||
7 | Let configure script build the real qmake, but right after it's built, swap | ||
8 | it with a native qmake for further internal use, preserving the real one. | ||
9 | |||
10 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
11 | --- | ||
12 | configure | 2 ++ | ||
13 | 1 file changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/configure b/configure | ||
16 | index 04fd1ba..8914e9c 100755 | ||
17 | --- a/configure | ||
18 | +++ b/configure | ||
19 | @@ -4112,6 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
20 | echo "Done." | ||
21 | fi | ||
22 | fi # Build qmake | ||
23 | +mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" | ||
24 | +mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" | ||
25 | |||
26 | echo "Running configuration tests..." | ||
27 | |||
28 | -- | ||
29 | 2.5.3 | ||
30 | |||