From 2b6a1cf9c7e05d204df82aa962d3ae09744dd86a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 2 Apr 2014 12:25:36 +0000 Subject: Revert "qt-mobility: remove /usr/lib from ld rpath-link option" * Basically part of the headers/libs are installed in ${D}(${libdir}/${includedir}) instead of ${D}(${libdir}/${includedir})/qt4 * http://lists.openembedded.org/pipermail/openembedded-core/2013-October/085815.html is related, but doesn't fix the issue completely, so better revert the commit which introduced this issue [YOCTO #5414] This reverts commit f7409a9fe83ba2535a43f39ed57cd78242a88557. Signed-off-by: Martin Jansa Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'meta/recipes-qt/qt4') 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 72d361ea9d..ff63d2b0d0 100644 --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc @@ -91,12 +91,6 @@ EOF 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