diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-18 15:55:38 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-20 14:45:14 +0100 |
| commit | 1fea2d7b4c5239463ce65f90f84221221b08f250 (patch) | |
| tree | 36401c6b0971c0fd78486e6e1dc1698968060013 | |
| parent | 7f8c441d96a61980d272eb7a2a7481e173286f72 (diff) | |
| download | meta-qt5-1fea2d7b4c5239463ce65f90f84221221b08f250.tar.gz | |
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 <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 6 |
1 files changed, 6 insertions, 0 deletions
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() { | |||
| 56 | QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" | 56 | QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" |
| 57 | EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" | 57 | EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" |
| 58 | 58 | ||
| 59 | do_install_append() { | ||
| 60 | # Remove paths to workdir, qtwebkit is dead now, so I won't spend extra time trying to prevent this | ||
| 61 | # from some .prl or .prf file like for other modules | ||
| 62 | sed -i 's@-Wl,-no-whole-archive -L${B}[^ ]* @ @g' ${D}${libdir}/pkgconfig/Qt5WebKit.pc | ||
| 63 | } | ||
| 64 | |||
| 59 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe | 65 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe |
| 60 | PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples" | 66 | PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples" |
| 61 | 67 | ||
