Revert "qt-mobility: remove /usr/lib from ld rpath-link option"
authorMartin Jansa <martin.jansa@gmail.com>
Wed, 2 Apr 2014 12:25:36 +0000 (12:25 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 4 Apr 2014 10:53:51 +0000 (11:53 +0100)
* 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.

(From OE-Core rev: 2b6a1cf9c7e05d204df82aa962d3ae09744dd86a)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc

index 72d361e..ff63d2b 100644 (file)
@@ -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