qtwebkit: fix textrel QA warnings when building qtwebkit for x86
PATCH 1/1 qtwebkit: fix textrel QA warnings when building qtwebkit for x86
WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel]
Patch from upstream webkit:
https://bugs.webkit.org/show_bug.cgi?id=70610
Minor refresh required to apply cleanly to the older webkit sources used by qtwebkit. Specifically, the patch needed to be modified to account for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ).
Signed-off-by Andre McCurdy <[email protected]>
--- recipes-qt/qt5/qtwebkit.inc | 7 ++- .../qtwebkit/0002-qtwebkit-fix-textrel-x86.patch | 68 ++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 recipes-qt/qt5/qtwebkit/0002-qtwebkit-fix-textrel-x86.patch
recipes-qt/qt5/qtwebkit.inc +5 -2
@@ -8,6 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt leveldb" +SRC_URI += "\ + file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ + file://0002-qtwebkit-fix-textrel-x86.patch \ +" + PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors" PACKAGECONFIG[gstreamer] = "OE_GSTREAMER_ENABLED,,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[gstreamer010] = "OE_GSTREAMER010_ENABLED,,gstreamer gst-plugins-base"
@@ -39,8 +44,6 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" # remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe 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 " -SRC_URI += "file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch" - # make sure rb files are used from sysroot, not from host # ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` # we need to replace it too (a bit longer version without importing re)
recipes-qt/qt5/qtwebkit/0002-qtwebkit-fix-textrel-x86.patch new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
1.9.1