summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2013-06-24 13:08:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-25 17:44:57 +0100
commitf8c32f74020df2af21257d790c00c874a3fb2052 (patch)
treef69b503191316d465c473d2e2266bccb0e1d605b /meta
parent1bbbf3616dabd4a032cee0c8aa75d998098beac5 (diff)
downloadpoky-f8c32f74020df2af21257d790c00c874a3fb2052.tar.gz
qt-mobility: remove /usr/lib from ld rpath-link option
Remove /usr/lib from ld rpath-link option to fix the below build error: bitbake_build/tmp/sysroots/x86-kvm-guest/usr/lib/libpng16.so.16: undefined reference to `inflateReset2@ZLIB_1.2.3.4' since sysroot seems not work for rpath-link, and "rpath-link,/usr/lib" makes ld to search host libraries for target libraries, once host has different version zlib, the error will happen. qmake uses QT_MOBILITY_LIB to generate "rpath-link,/usr/lib" when do_configure but we can not add sysroot into QT_MOBILITY_LIB, since QT_MOBILITY_LIB is dir which libraries will be installed to, so I remove this dir from rpath-link before do_compile (From OE-Core rev: f7409a9fe83ba2535a43f39ed57cd78242a88557) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index b0e4278a16..aba84ab3b9 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -59,6 +59,12 @@ do_configure_prepend() {
59 echo CONFIG += ${qtm_embedded} >>./config.pri 59 echo CONFIG += ${qtm_embedded} >>./config.pri
60} 60}
61 61
62do_compile_prepend() {
63 for NAME in `find ./ -name Makefile` ; do
64 sed -e 's:-Wl,-rpath-link,${libdir}::g' -i $NAME
65 done
66}
67
62do_install() { 68do_install() {
63 for NAME in */*.prf 69 for NAME in */*.prf
64 do 70 do