mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 18:32:12 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
1a61109d03
commit
7b6cd925d4
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user