summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2013-07-11 03:04:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-13 18:23:36 +0100
commit02d5ea60b9bdef06dd534403a3e74e6885fb0956 (patch)
tree1e2e5d503d6c135a8998de28ef2793a63277e8d1 /meta/recipes-qt
parentc54004403ae8add07b902dd408c8a939ae3874e1 (diff)
downloadast2050-yocto-poky-02d5ea60b9bdef06dd534403a3e74e6885fb0956.zip
ast2050-yocto-poky-02d5ea60b9bdef06dd534403a3e74e6885fb0956.tar.gz
qt4-x11-free: fix post-processing of QtWebKit.pc
Previously it worked for qt4-embedded only. qt4-x11-free has X11 libs between -lwebcore and -ljscore. (From OE-Core rev: 5110f3894902db6e9a35cce40b91943b3b2ee237) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> 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/qt4.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 81866ea..6adc404 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -345,7 +345,8 @@ do_install() {
-e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
-e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
-e 's#Iin#I${in#g' \
- -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore\s\+-ljscore##g' \
+ -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore##g' \
+ -e 's#-ljscore##g' \
${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \
OpenPOWER on IntegriCloud