diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2013-07-11 03:04:17 +0200 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-07-12 10:12:12 -0700 |
| commit | 5110f3894902db6e9a35cce40b91943b3b2ee237 (patch) | |
| tree | 938585a351da531f78dc577f36af69277586d28e /meta/recipes-qt/qt4 | |
| parent | d78ecdbd66d8d93ecf67f56cfbbf4b954dec3c7b (diff) | |
| download | openembedded-core-contrib-5110f3894902db6e9a35cce40b91943b3b2ee237.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.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4')
| -rw-r--r-- | 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 81866ea6e95..6adc4042c8f 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 \ |