summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-07 20:36:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-13 11:45:10 (GMT)
commit7b6cd925d445bf69373bb9f33d90317ca8bc1a80 (patch)
tree2077165705f15d40db010b500b358cc14fab0662 /meta/recipes-qt
parent1a61109d0305725af9c7ff0fc8a7f14078ca2ff8 (diff)
downloadpoky-7b6cd925d445bf69373bb9f33d90317ca8bc1a80.tar.gz
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. (From OE-Core rev: 4c41a3204ef72f53813ddc86fe525fa9c6714daa) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc1
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 80948f3..0e57e5a 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
2SECTION = "libs" 2SECTION = "libs"
3HOMEPAGE = "http://qt.nokia.com" 3HOMEPAGE = "http://qt.nokia.com"
4DEPENDS += "directfb tslib" 4DEPENDS += "directfb tslib"
5INC_PR = "r41" 5INC_PR = "r42"
6 6
7QT_BASE_LIB ?= "libqt-embedded" 7QT_BASE_LIB ?= "libqt-embedded"
8 8
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 75487f7..56f349a 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"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r38" 8INC_PR = "r39"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 2e70bd9..77fb06f 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -328,6 +328,7 @@ do_install() {
328 -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \ 328 -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
329 -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \ 329 -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
330 -e 's#Iin#I${in#g' \ 330 -e 's#Iin#I${in#g' \
331 -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore\s\+-ljscore##g' \
331 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc 332 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
332 333
333 sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \ 334 sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \