From 1fea2d7b4c5239463ce65f90f84221221b08f250 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Feb 2016 15:55:38 +0100 Subject: qtwebkit: Fix QA Warning * there are multiple -L paths to workdir, causing QA warning like this: ERROR: qtwebkit-5.5.99+5.6.0-rc+gitAUTOINC+d2ff5a0855-r0 do_populate_sysroot: QA Issue: Qt5WebKit.pc failed sanity test (tmpdir) in path qtwebkit/5.5.99+5.6.0-rc+gitAUTOINC+d2ff5a0855-r0/sysroot-destdir//usr/lib/pkgconfig [pkgconfig] * qtwebkit is dead, so hack it with simple sed, feel free to fix it in mkspecs if you want Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit_git.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 559efacb..9044d4fb 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -56,6 +56,12 @@ do_configure_prepend() { QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" +do_install_append() { + # Remove paths to workdir, qtwebkit is dead now, so I won't spend extra time trying to prevent this + # from some .prl or .prf file like for other modules + sed -i 's@-Wl,-no-whole-archive -L${B}[^ ]* @ @g' ${D}${libdir}/pkgconfig/Qt5WebKit.pc +} + # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples" -- cgit v1.2.3