Building qtwebkit would cause a QA issue (which, in my distro, would cause a
build error) such that QtWebPluginProcess and QtWebProcess would contain bad
RPATHs which pointed into the build location. This fix adds a patch to not
include the rpath.prf which leads to this problem.
Signed-off-by: Trevor Woerner <trevor.woer...@linaro.org>
---
recipes-qt/qt5/qtwebkit-5.0.2/rpath.patch | 12 ++++++++++++
recipes-qt/qt5/qtwebkit_5.0.2.bb | 3 +++
2 files changed, 15 insertions(+)
create mode 100644 recipes-qt/qt5/qtwebkit-5.0.2/rpath.patch
diff --git a/recipes-qt/qt5/qtwebkit-5.0.2/rpath.patch
b/recipes-qt/qt5/qtwebkit-5.0.2/rpath.patch
new file mode 100644
index 0000000..f74a5cf
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit-5.0.2/rpath.patch
@@ -0,0 +1,12 @@
+diff -urN
qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/unix/default_post.prf
qtwebkit-opensource-src-5.0.2__new/Tools/qmake/mkspecs/features/unix/default_post.prf
+---
qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/unix/default_post.prf
2013-04-08 20:11:53.000000000 -0400
++++
qtwebkit-opensource-src-5.0.2__new/Tools/qmake/mkspecs/features/unix/default_post.prf
2013-09-22 22:37:51.096270035 -0400
+@@ -32,8 +32,6 @@
+ 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
diff --git a/recipes-qt/qt5/qtwebkit_5.0.2.bb b/recipes-qt/qt5/qtwebkit_5.0.2.bb
index 4d2f34d..1cad62b 100644
--- a/recipes-qt/qt5/qtwebkit_5.0.2.bb
+++ b/recipes-qt/qt5/qtwebkit_5.0.2.bb
@@ -2,6 +2,9 @@ require qt5-${PV}.inc
require ${PN}.inc
PR = "${INC_PR}.0"
+SRC_URI += "\
+ file://rpath.patch\
+ "
SRC_URI[md5sum] = "85aad9f287910c21c8464d7d1ea010a9"
SRC_URI[sha256sum] =
"6ff4038f8db68be51661d1a6646f510b26f6ebbecbdeefb76cd8361f808768f6"
--
1.8.4.rc3.1.gc1ebd90
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
