From 0f574ccf07fd35fb3a8a9ddf01b5fd1ce6865cad Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 17 May 2011 11:53:22 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/files/mips-relocate.patch | 28 --------------------------- 1 file changed, 28 deletions(-) delete mode 100644 meta/recipes-qt/qt4/files/mips-relocate.patch (limited to 'meta/recipes-qt/qt4/files/mips-relocate.patch') 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 @@ -Disable the LDFLAGS "-Bsymbolic-functions" for mips - -"-Bsymbolic-functions" flag makes ld to bind the global function symbol of shared library at compiling time, thus reduce the runtime relocation cost. - -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. - -So this patch disable this flag for QT4 mips. If future binutils version fix this issue, this patch can be safely removed. - -Signed-off-by: Yu Ke - -diff --git a/configure b/configure -index ca14279..5db9926 100755 ---- a/configure -+++ b/configure -@@ -3035,6 +3035,13 @@ if [ "$CFG_REDUCE_RELOCATIONS" != "no" ]; then - fi - fi - -+# Temporily disable -Bsymbolic-functions for mips, because libQtWebKit can not pass the build -+# if has -Bsymbolic-functions and binutil 2.20 -+# -Bsymbolic-functions is OK in binutil 2.19 -+if [ "$CFG_ARCH" = "mips" ]; then -+ CFG_REDUCE_RELOCATIONS=no -+fi -+ - # auto-detect GNU make support - if [ "$CFG_USE_GNUMAKE" = "auto" ] && "$MAKE" -v | grep "GNU Make" >/dev/null 2>&1; then - CFG_USE_GNUMAKE=yes -- cgit v1.2.3-54-g00ecf