aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-04-02 12:25:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-04 11:50:15 +0100
commit2b6a1cf9c7e05d204df82aa962d3ae09744dd86a (patch)
treed2e0a17eddf47cf7b9eada78021abebdb779707e /meta/recipes-qt
parent0b8ff2231a36755a71d8bf8c7854364d69ef2df8 (diff)
downloadopenembedded-core-contrib-2b6a1cf9c7e05d204df82aa962d3ae09744dd86a.tar.gz
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@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc6
1 files changed, 0 insertions, 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 72d361ea9d1..ff63d2b0d03 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