diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 9c467dc..0c68134 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -13,7 +13,4 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" INC_PR = "r0" -do_configure_append() { - # Fix rpaths for QtWebProcess - find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${B}/lib||g" -} +SRC_URI += "file://fix-rpath.patch" diff --git a/recipes-qt/qt5/qtwebkit/fix-rpath.patch b/recipes-qt/qt5/qtwebkit/fix-rpath.patch new file mode 100644 index 0000000..5c20514 --- /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