diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-05-30 14:37:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-10 12:11:51 +0200 |
commit | cf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff (patch) | |
tree | a9bd7e40b22d3ccf789a0506a4c2fc7c30593d6f /recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch | |
parent | a0da57e5ce2862758e10b82c30c200e365b29f46 (diff) | |
download | meta-qt5-cf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff.tar.gz |
recipes-git: Upgrade to latest origin/stable
* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch new file mode 100644 index 00000000..79ac5e89 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 3db5991e607a82403272b0ea821fc84e3c8b6d2a 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 7/8] configure: preserve built qmake and swap with native one | ||
5 | |||
6 | Let configure script build the real qmake, but right after it's built, swap | ||
7 | it with a native qmake for further internal use, preserving the real one. | ||
8 | |||
9 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
10 | --- | ||
11 | configure | 2 ++ | ||
12 | 1 file changed, 2 insertions(+) | ||
13 | |||
14 | diff --git a/configure b/configure | ||
15 | index 48d5119..b7aac15 100755 | ||
16 | --- a/configure | ||
17 | +++ b/configure | ||
18 | @@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
19 | |||
20 | (cd "$outpath/qmake"; "$MAKE") || exit 2 | ||
21 | fi # Build qmake | ||
22 | +mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" | ||
23 | +mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" | ||
24 | |||
25 | echo "Running configuration tests..." | ||
26 | |||
27 | -- | ||
28 | 2.0.0 | ||
29 | |||