summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch19
1 files changed, 10 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
index 9324da9a..f1b9bdb7 100644
--- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
@@ -1,7 +1,7 @@
1From fe714df9641286e3f005e0021e1c6462fb0b061e Mon Sep 17 00:00:00 2001 1From 97d4af4ea8708829d6df276ae741c2076cb472e8 Mon Sep 17 00:00:00 2001
2From: Trevor Woerner <trevor.woerner@linaro.org> 2From: Trevor Woerner <trevor.woerner@linaro.org>
3Date: Fri, 7 Feb 2014 04:07:17 +0100 3Date: Fri, 7 Feb 2014 04:07:17 +0100
4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH 1/2] qtwebkit: fix QA issue (bad RPATH)
5 5
6Building qtwebkit causes a QA issue such that QtWebPluginProcess and 6Building qtwebkit causes a QA issue such that QtWebPluginProcess and
7QtWebProcess contain bad RPATHs which point into the build location. This fix 7QtWebProcess contain bad RPATHs which point into the build location. This fix
@@ -9,21 +9,22 @@ adds a patch to not include the rpath.prf which causes this problem.
9 9
10Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> 10Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12Signed-off-by: Jonathan Liu <net147@gmail.com>
13--- 12---
14 Tools/qmake/mkspecs/features/unix/default_post.prf | 2 -- 13 Tools/qmake/mkspecs/features/unix/default_post.prf | 1 -
15 1 file changed, 2 deletions(-) 14 1 file changed, 1 deletion(-)
16 15
17diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf 16diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
18index 9c52406..7ece013 100644 17index fd66af6..ef754c3 100644
19--- a/Tools/qmake/mkspecs/features/unix/default_post.prf 18--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
20+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf 19+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
21@@ -59,8 +59,6 @@ linux-*g++* { 20@@ -61,7 +61,6 @@ linux-*g++* {
22 } 21 }
23 } 22 }
24 23
25-contains(TEMPLATE, app): CONFIG += rpath 24-contains(TEMPLATE, app): CONFIG += rpath
26- 25
27 CONFIG(debug, debug|release)|force_debug_info { 26 CONFIG(debug, debug|release)|force_debug_info {
28 # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. 27 # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
29 !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory 28--
292.3.1
30