diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-07 21:36:28 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-13 11:44:45 +0000 |
| commit | 4c41a3204ef72f53813ddc86fe525fa9c6714daa (patch) | |
| tree | 0049040daeee2b75f505c58631f17dd94892ba01 /meta/recipes-qt | |
| parent | 92a8d604674bd500fdb4008bc34791776c84ae33 (diff) | |
| download | openembedded-core-4c41a3204ef72f53813ddc86fe525fa9c6714daa.tar.gz openembedded-core-4c41a3204ef72f53813ddc86fe525fa9c6714daa.tar.bz2 openembedded-core-4c41a3204ef72f53813ddc86fe525fa9c6714daa.tar.xz openembedded-core-4c41a3204ef72f53813ddc86fe525fa9c6714daa.zip | |
qt4: fix deps in libQtWebkit.la and QtWebKit.pc
* Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore
* These paths and libs don't get installed.
* When building a shared lib with libtool, that links
with libQtWebKit, libtool adds these unneeded parameters
to the linker command-line, thus linking fails.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 80948f369..0e57e5ad9 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is SECTION = "libs" HOMEPAGE = "http://qt.nokia.com" DEPENDS += "directfb tslib" -INC_PR = "r41" +INC_PR = "r42" QT_BASE_LIB ?= "libqt-embedded" diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 75487f756..56f349a31 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r38" +INC_PR = "r39" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 2e70bd91e..77fb06fec 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -328,6 +328,7 @@ 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' \ ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \ |