diff options
author | Kai Kang <kai.kang@windriver.com> | 2015-06-02 09:52:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-08 17:34:02 +0100 |
commit | ba93bdd38dad2146e40d42f8cd20dc7a755529dc (patch) | |
tree | f3aa3d5f31b6833c0d2e4698811d6405788164d3 /meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch | |
parent | 20a3a36547831349d5d8b429cb35f1415a856bda (diff) | |
download | poky-ba93bdd38dad2146e40d42f8cd20dc7a755529dc.tar.gz |
qt4: upgrade to 4.8.7
Upgrade qt4 packages from version 4.8.6 to 4.8.7.
* remove arm64 related patches which are merged
* remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch
which is backported.
* update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
and 0013-configure-add-crossarch-option.patch for new version
* remove useless variable INC_PR
(From OE-Core rev: 4d033fdc5e754e22edb2e9074e30e58847c4b791)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch new file mode 100644 index 0000000000..762cdaf978 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 549342fa380ed2a9ad41be3d04ee2f0585f6a465 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Lauer <mickey@vanille-media.de> | ||
3 | Date: Wed, 26 Sep 2012 20:41:32 +0200 | ||
4 | Subject: [PATCH 13/21] configure: add "-crossarch" option | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | |||
10 | Update for qt 4.8.7 | ||
11 | |||
12 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
13 | --- | ||
14 | configure | 7 ++++++- | ||
15 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure b/configure | ||
18 | index 4eb4a3d..a4dacec 100755 | ||
19 | --- a/configure | ||
20 | +++ b/configure | ||
21 | @@ -1160,7 +1160,7 @@ while [ "$#" -gt 0 ]; do | ||
22 | shift | ||
23 | VAL=$1 | ||
24 | ;; | ||
25 | - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-psql_config|-sysroot) | ||
26 | + -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-psql_config|-sysroot|-crossarch) | ||
27 | VAR=`echo $1 | sed "s,^-\(.*\),\1,"` | ||
28 | shift | ||
29 | VAL="$1" | ||
30 | @@ -1719,6 +1719,9 @@ while [ "$#" -gt 0 ]; do | ||
31 | DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"` | ||
32 | DeviceVar set $DEV_VAR $DEV_VAL | ||
33 | ;; | ||
34 | + crossarch) | ||
35 | + CROSSARCH="$VAL" | ||
36 | + ;; | ||
37 | debug-and-release) | ||
38 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
39 | CFG_DEBUG_RELEASE="$VAL" | ||
40 | @@ -3333,6 +3336,8 @@ arm*) | ||
41 | ;; | ||
42 | esac | ||
43 | |||
44 | +CFG_ARCH="$CROSSARCH" | ||
45 | + | ||
46 | if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then | ||
47 | if [ "$OPT_VERBOSE" = "yes" ]; then | ||
48 | echo " '$CFG_ARCH' is supported" | ||
49 | -- | ||
50 | 1.8.0 | ||
51 | |||