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>
This commit is contained in:
parent
f11b1722e2
commit
918d5d9671
|
@ -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
|
# 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 "
|
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() {
|
SRC_URI += "file://fix-rpath.patch"
|
||||||
# Fix rpaths for QtWebProcess
|
|
||||||
find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${B}/lib||g"
|
|
||||||
}
|
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue