sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Roy.Li 2013-06-24 13:08:03 +08:00 committed by Richard Purdie
parent 1bbbf3616d
commit f8c32f7402
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
View File

@ -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