t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-16 20:21:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtwebkit: fix QA issue (bad RPATH)

Browse Source 
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>
This commit is contained in:
Trevor Woerner
2013-09-24 02:35:11 +00:00
committed by Martin Jansa
parent fbf33d6d9e
commit ee726d2e14
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
recipes-qt/qt5/qtwebkit.inc
View File

@@ -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"

13
recipes-qt/qt5/qtwebkit/fix-rpath.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf
===================================================================
--- qtwebkit-opensource-src-5.1.0.orig/Tools/qmake/mkspecs/features/unix/default_post.prf
+++ qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf
@@ -32,8 +32,6 @@ linux-*g++* {
QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
}
-contains(TEMPLATE, app): CONFIG += rpath
-
isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) {
# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory