aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/fix-rpath.patch
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-05 14:43:51 +0200
commitee726d2e14943034c36a9ca0234571c2a276ec94 (patch)
tree0005a5f63c631da5fd65be7854ad5c9456a51bc3 /recipes-qt/qt5/qtwebkit/fix-rpath.patch
parentfbf33d6d9e283e4d05add5b746b8b94b549c2213 (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/fix-rpath.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit/fix-rpath.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/fix-rpath.patch b/recipes-qt/qt5/qtwebkit/fix-rpath.patch
new file mode 100644
index 00000000..5c205144
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/fix-rpath.patch
@@ -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