From patchwork Tue Mar 13 07:58:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 12/23] qt4: fix deps in libQtWebkit.la and QtWebKit.pc Date: Tue, 13 Mar 2012 07:58:46 -0000 From: Saul Wold X-Patchwork-Id: 23109 Message-Id: <325c9ad123640bb388967f36b63fc99ced9ebd56.1331589797.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Andreas Oberritter * 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 --- meta/recipes-qt/qt4/qt4-embedded.inc | 2 +- meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +- 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 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 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 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" 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 2e70bd9..77fb06f 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 \