diff options
| author | Trevor Woerner <trevor.woerner@linaro.org> | 2013-09-24 02:35:11 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-03 18:01:17 +0200 |
| commit | 918d5d9671130580bd7f31cc5b69f7be127063ae (patch) | |
| tree | f7bc8d43712e9aca9c330802d5b2aa112be871be | |
| parent | f11b1722e28800c790609d0de9541f6555e1ee5a (diff) | |
| download | meta-qt5-918d5d9671130580bd7f31cc5b69f7be127063ae.tar.gz | |
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>
| -rw-r--r-- | recipes-qt/qt5/qtwebkit.inc | 5 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebkit/fix-rpath.patch | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 75492d58..458eb92a 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc | |||
| @@ -14,7 +14,4 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" | |||
| 14 | # remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe | 14 | # remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe |
| 15 | PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " | 15 | PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " |
| 16 | 16 | ||
| 17 | do_configure_append() { | 17 | SRC_URI += "file://fix-rpath.patch" |
| 18 | # Fix rpaths for QtWebProcess | ||
| 19 | find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${B}/lib||g" | ||
| 20 | } | ||
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 @@ | |||
| 1 | Index: qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
| 2 | =================================================================== | ||
| 3 | --- qtwebkit-opensource-src-5.1.0.orig/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
| 4 | +++ qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
| 5 | @@ -32,8 +32,6 @@ linux-*g++* { | ||
| 6 | QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions | ||
| 7 | } | ||
| 8 | |||
| 9 | -contains(TEMPLATE, app): CONFIG += rpath | ||
| 10 | - | ||
| 11 | isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) { | ||
| 12 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. | ||
| 13 | config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory | ||