[oe-commits] Andreas Oberritter : qt4-x11-free: fix post-processing of QtWebKit.pc

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 5110f3894902db6e9a35cce40b91943b3b2ee237
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5110f3894902db6e9a35cce40b91943b3b2ee237

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Thu Jul 11 03:04:17 2013 +0200

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.

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-qt/qt4/qt4.inc |    3 ++-
 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 \