diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-05-17 11:53:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-18 14:32:47 +0100 |
commit | 0f574ccf07fd35fb3a8a9ddf01b5fd1ce6865cad (patch) | |
tree | 07358c94e34a81ed31fbe5701512f687ece3d98a /meta/recipes-qt/qt4/files/mips-relocate.patch | |
parent | 000368f1e78ad0dd68ebbf7e3d4135ca6bfad777 (diff) | |
download | poky-0f574ccf07fd35fb3a8a9ddf01b5fd1ce6865cad.tar.gz |
qt4: remove Qt 4.6.3
We should only have one version of Qt4 supported in oe-core.
(From OE-Core rev: 95f348d81353ea105493d0cc360d63b6b7264ce5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/files/mips-relocate.patch')
-rw-r--r-- | meta/recipes-qt/qt4/files/mips-relocate.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-qt/qt4/files/mips-relocate.patch b/meta/recipes-qt/qt4/files/mips-relocate.patch deleted file mode 100644 index 2fde9a0dcf..0000000000 --- a/meta/recipes-qt/qt4/files/mips-relocate.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Disable the LDFLAGS "-Bsymbolic-functions" for mips | ||
2 | |||
3 | "-Bsymbolic-functions" flag makes ld to bind the global function symbol of shared library at compiling time, thus reduce the runtime relocation cost. | ||
4 | |||
5 | However, this flag in binutil 2.20 cause QT4 mips building failure, which is "final link failed: Bad value" error in libQtWebKit.so linking stage. If downgrad to binutil 2.19, this error disappears. further investigation showes commit http://sourceware.org/cgi-bin/cvsweb.cgi/src/ld/scripttempl/mips.sc.diff?r1=1.2&r2=1.3&cvsroot=src cause this error. | ||
6 | |||
7 | So this patch disable this flag for QT4 mips. If future binutils version fix this issue, this patch can be safely removed. | ||
8 | |||
9 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
10 | |||
11 | diff --git a/configure b/configure | ||
12 | index ca14279..5db9926 100755 | ||
13 | --- a/configure | ||
14 | +++ b/configure | ||
15 | @@ -3035,6 +3035,13 @@ if [ "$CFG_REDUCE_RELOCATIONS" != "no" ]; then | ||
16 | fi | ||
17 | fi | ||
18 | |||
19 | +# Temporily disable -Bsymbolic-functions for mips, because libQtWebKit can not pass the build | ||
20 | +# if has -Bsymbolic-functions and binutil 2.20 | ||
21 | +# -Bsymbolic-functions is OK in binutil 2.19 | ||
22 | +if [ "$CFG_ARCH" = "mips" ]; then | ||
23 | + CFG_REDUCE_RELOCATIONS=no | ||
24 | +fi | ||
25 | + | ||
26 | # auto-detect GNU make support | ||
27 | if [ "$CFG_USE_GNUMAKE" = "auto" ] && "$MAKE" -v | grep "GNU Make" >/dev/null 2>&1; then | ||
28 | CFG_USE_GNUMAKE=yes | ||