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)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 13 Jul 2013 17:23:36 +0000 (18:23 +0100)
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>
meta/recipes-qt/qt4/qt4.inc

index 81866ea..6adc404 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 \