summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4.inc
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-07 21:36:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-13 11:45:10 +0000
commit7b6cd925d445bf69373bb9f33d90317ca8bc1a80 (patch)
tree2077165705f15d40db010b500b358cc14fab0662 /meta/recipes-qt/qt4/qt4.inc
parent1a61109d0305725af9c7ff0fc8a7f14078ca2ff8 (diff)
downloadpoky-7b6cd925d445bf69373bb9f33d90317ca8bc1a80.tar.gz
qt4: fix deps in libQtWebkit.la and QtWebKit.pc
* Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore * These paths and libs don't get installed. * When building a shared lib with libtool, that links with libQtWebKit, libtool adds these unneeded parameters to the linker command-line, thus linking fails. (From OE-Core rev: 4c41a3204ef72f53813ddc86fe525fa9c6714daa) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 2e70bd91e2..77fb06fecd 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -328,6 +328,7 @@ do_install() {
328 -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \ 328 -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
329 -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \ 329 -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
330 -e 's#Iin#I${in#g' \ 330 -e 's#Iin#I${in#g' \
331 -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore\s\+-ljscore##g' \
331 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc 332 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
332 333
333 sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \ 334 sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \