diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2013-07-11 03:04:17 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-13 18:23:36 +0100 |
| commit | 02d5ea60b9bdef06dd534403a3e74e6885fb0956 (patch) | |
| tree | 1e2e5d503d6c135a8998de28ef2793a63277e8d1 | |
| parent | c54004403ae8add07b902dd408c8a939ae3874e1 (diff) | |
| download | poky-02d5ea60b9bdef06dd534403a3e74e6885fb0956.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.
(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>
| -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 81866ea6e9..6adc4042c8 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
| @@ -345,7 +345,8 @@ do_install() { | |||
| 345 | -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \ | 345 | -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \ |
| 346 | -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \ | 346 | -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \ |
| 347 | -e 's#Iin#I${in#g' \ | 347 | -e 's#Iin#I${in#g' \ |
| 348 | -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore\s\+-ljscore##g' \ | 348 | -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore##g' \ |
| 349 | -e 's#-ljscore##g' \ | ||
| 349 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc | 350 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc |
| 350 | 351 | ||
| 351 | sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \ | 352 | sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \ |