From: Andreas Oberritter Date: Thu, 11 Jul 2013 01:04:17 +0000 (+0200) Subject: qt4-x11-free: fix post-processing of QtWebKit.pc X-Git-Tag: 2015-4~5854 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5110f3894902db6e9a35cce40b91943b3b2ee237;p=openembedded-core.git 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 Signed-off-by: Saul Wold --- diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 81866ea6e9..6adc4042c8 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 \