aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit.inc
diff options
context:
space:
mode:
authorTrevor Woerner <trevor.woerner@linaro.org>2013-09-24 02:35:11 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-03 18:01:17 +0200
commit918d5d9671130580bd7f31cc5b69f7be127063ae (patch)
treef7bc8d43712e9aca9c330802d5b2aa112be871be /recipes-qt/qt5/qtwebkit.inc
parentf11b1722e28800c790609d0de9541f6555e1ee5a (diff)
qtwebkit: fix QA issue (bad RPATH)
Building qtwebkit causes a QA issue such that QtWebPluginProcess and QtWebProcess contain bad RPATHs which point into the build location. This fix adds a patch to not include the rpath.prf which causes this problem. Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit.inc')
-rw-r--r--recipes-qt/qt5/qtwebkit.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index 75492d58..458eb92a 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -14,7 +14,4 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
# remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe
PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
-do_configure_append() {
- # Fix rpaths for QtWebProcess
- find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${B}/lib||g"
-}
+SRC_URI += "file://fix-rpath.patch"