diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:18:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:28 +0100 |
commit | 42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d (patch) | |
tree | d04aaf16c9e9492586937186d48eb9f0dfa2631e /meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch | |
parent | 89386fde895a585c6322fc94b594c35a355555e7 (diff) | |
download | poky-42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d.tar.gz |
qt4: add 4.8.3 version with negative D_P
* rebased patches, 3 patches are resolved upstream:
0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b
0022-webkit-fix-conflicting-types.patch
resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1
(From OE-Core rev: b9fc4928bb93ad720c47920db3869d860c531d0a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch new file mode 100644 index 0000000000..c216c8586e --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 8785f376533ffdcf4c32b53274e8c40f567d7fd5 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/20] configure: add "-crossarch" option | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | configure | 7 ++++++- | ||
11 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/configure b/configure | ||
14 | index cd66d05..f2c0725 100755 | ||
15 | --- a/configure | ||
16 | +++ b/configure | ||
17 | @@ -1141,7 +1141,7 @@ while [ "$#" -gt 0 ]; do | ||
18 | shift | ||
19 | VAL=$1 | ||
20 | ;; | ||
21 | - -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|-sysroot) | ||
22 | + -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|-sysroot|-crossarch) | ||
23 | VAR=`echo $1 | sed "s,^-\(.*\),\1,"` | ||
24 | shift | ||
25 | VAL="$1" | ||
26 | @@ -1697,6 +1697,9 @@ while [ "$#" -gt 0 ]; do | ||
27 | DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"` | ||
28 | DeviceVar set $DEV_VAR $DEV_VAL | ||
29 | ;; | ||
30 | + crossarch) | ||
31 | + CROSSARCH="$VAL" | ||
32 | + ;; | ||
33 | debug-and-release) | ||
34 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
35 | CFG_DEBUG_RELEASE="$VAL" | ||
36 | @@ -3297,6 +3300,8 @@ arm*) | ||
37 | ;; | ||
38 | esac | ||
39 | |||
40 | +CFG_ARCH="$CROSSARCH" | ||
41 | + | ||
42 | if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then | ||
43 | if [ "$OPT_VERBOSE" = "yes" ]; then | ||
44 | echo " '$CFG_ARCH' is supported" | ||
45 | -- | ||
46 | 1.7.12 | ||
47 | |||