From f7409a9fe83ba2535a43f39ed57cd78242a88557 Mon Sep 17 00:00:00 2001 From: "Roy.Li" Date: Mon, 24 Jun 2013 13:08:03 +0800 Subject: 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 Signed-off-by: Roy.Li Signed-off-by: Saul Wold --- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/recipes-qt') 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() { echo CONFIG += ${qtm_embedded} >>./config.pri } +do_compile_prepend() { + for NAME in `find ./ -name Makefile` ; do + sed -e 's:-Wl,-rpath-link,${libdir}::g' -i $NAME + done +} + do_install() { for NAME in */*.prf do -- cgit 1.2.3-korg