summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
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:43:42 +0100
commitf7409a9fe83ba2535a43f39ed57cd78242a88557 (patch)
tree738c6201d93f4fffc54d2c5b3445e4431a60b138 /meta/recipes-qt
parent2df53911f25234d2724bc8163ac9406af0bdad06 (diff)
downloadopenembedded-core-f7409a9fe83ba2535a43f39ed57cd78242a88557.tar.gz
openembedded-core-f7409a9fe83ba2535a43f39ed57cd78242a88557.tar.bz2
openembedded-core-f7409a9fe83ba2535a43f39ed57cd78242a88557.zip
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 <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
-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() {
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