summaryrefslogtreecommitdiffstats
path: root/meta
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:53:51 +0100
commit84aeaa4d562fff13368af653ee09ecb93d11372a (patch)
treece8efd292ec9e74731da45db7c06f7cece102ee1 /meta
parentd2c395a618c4bbdd8a52a136f8b3822f448200d7 (diff)
downloadpoky-84aeaa4d562fff13368af653ee09ecb93d11372a.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. (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>
Diffstat (limited to 'meta')
-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 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
91 echo CONFIG += ${qtm_embedded} >>./config.pri 91 echo CONFIG += ${qtm_embedded} >>./config.pri
92} 92}
93 93
94do_compile_prepend() {
95 for NAME in `find ./ -name Makefile` ; do
96 sed -e 's:-Wl,-rpath-link,${libdir}::g' -i $NAME
97 done
98}
99
100do_install() { 94do_install() {
101 for NAME in */*.prf 95 for NAME in */*.prf
102 do 96 do