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 <[email protected]> --- recipes-qt/qt5/qtwebkit-5.1.0/fix-rpath.patch | 13 +++++++++++++ recipes-qt/qt5/qtwebkit_5.1.0.bb | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 recipes-qt/qt5/qtwebkit-5.1.0/fix-rpath.patch diff --git a/recipes-qt/qt5/qtwebkit-5.1.0/fix-rpath.patch b/recipes-qt/qt5/qtwebkit-5.1.0/fix-rpath.patch new file mode 100644 index 0000000..5c20514 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-5.1.0/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 diff --git a/recipes-qt/qt5/qtwebkit_5.1.0.bb b/recipes-qt/qt5/qtwebkit_5.1.0.bb index 77725e3..4ae151e 100644 --- a/recipes-qt/qt5/qtwebkit_5.1.0.bb +++ b/recipes-qt/qt5/qtwebkit_5.1.0.bb @@ -3,3 +3,7 @@ require ${PN}.inc SRC_URI[md5sum] = "fad7e7d6637719c2be101f9b3957d451" SRC_URI[sha256sum] = "b49c4cfae697ea67142e7b35ecb0e3fec06814153e8226b8c6655c4dafc92ac3" + +SRC_URI += "\ + file://fix-rpath.patch \ + " -- 1.8.4.rc3.1.gc1ebd90 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
