[oe-commits] Martin Jansa : Revert "qt-mobility: remove /usr/ lib from ld rpath-link option"

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 2b6a1cf9c7e05d204df82aa962d3ae09744dd86a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2b6a1cf9c7e05d204df82aa962d3ae09744dd86a

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Wed Apr  2 12:25:36 2014 +0000

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 <Martin.Jansa at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 6 ------
 1 file changed, 6 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 72d361e..ff63d2b 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