diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-03 11:03:36 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-03 12:04:28 +0100 |
commit | 1ec312f314343f287956dcab5482571039a94ff1 (patch) | |
tree | 604453191dd176e0b53f42eb538be017496235b7 /recipes-qt/qt4/files/mips-relocate.patch | |
parent | 63057a32d7b877c39b85eb3e9168c6fd7e4ce579 (diff) | |
download | meta-openembedded-contrib-1ec312f314343f287956dcab5482571039a94ff1.tar.gz |
qt4: import files from OE
This gives us both qt4-x11 and qt4-embedded; qt4-x11 was already present in yocto, but was lacking features
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-qt/qt4/files/mips-relocate.patch')
-rw-r--r-- | recipes-qt/qt4/files/mips-relocate.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes-qt/qt4/files/mips-relocate.patch b/recipes-qt/qt4/files/mips-relocate.patch new file mode 100644 index 0000000000..2fde9a0dcf --- /dev/null +++ b/recipes-qt/qt4/files/mips-relocate.patch @@ -0,0 +1,28 @@ +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 <ke.yu@intel.com> + +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 |