]> code.ossystems Code Review - openembedded-core.git/commitdiff
qt4-x11-free: fix post-processing of QtWebKit.pc
authorAndreas Oberritter <obi@opendreambox.org>
Thu, 11 Jul 2013 01:04:17 +0000 (03:04 +0200)
committerSaul Wold <sgw@linux.intel.com>
Fri, 12 Jul 2013 17:12:12 +0000 (10:12 -0700)
Previously it worked for qt4-embedded only. qt4-x11-free has X11
libs between -lwebcore and -ljscore.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-qt/qt4/qt4.inc

index 81866ea6e95411337b6353a65ba20bc64661750d..6adc4042c8f552b304972b33c60c4cb3b579626b 100644 (file)
@@ -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 \