[PATCH 0/1] fix qt-mobility-x11 build failure

[PATCH 0/1] fix qt-mobility-x11 build failure

[rongqing.li]

From: "Roy.Li" <rongqing.li@windriver.com>

The following changes since commit b2df9eef5a99e1d5a9dd262c1091b409a8c8174d:

  psplash: Bump PR to allow removal of PRINC from meta-yocto (2013-06-21 14:23:16 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib roy/qt-mobility
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/qt-mobility

Roy.Li (1):
  qt-mobility: remove /usr/lib from ld rpath-link option

 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |    6 ++++++
 1 file changed, 6 insertions(+)

-- 
1.7.10.4

[PATCH 1/1] qt-mobility: remove /usr/lib from ld rpath-link option

[rongqing.li]

From: "Roy.Li" <rongqing.li@windriver.com>

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>
---
 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |    6 ++++++
 1 file changed, 6 insertions(+)

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 b0e4278..aba84ab 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
-- 
1.7.10.4