t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-03 20:54:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

qwt-qt5: Fix rpath issues

Browse Source 
It errors out
usr/plugins/designer/libqwt_designer_plugin.so [rpaths]
QA Issue: qwt-qt5-plugins: found library in wrong location: /usr/plugins/designer/libqwt_designer_plugin.so

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2017-07-10 23:31:02 -07:00
committed by Martin Jansa
parent aa0605d3c7
commit 00d72cd892
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
recipes-qt/qwt/qwt-qt5.inc
View File

@@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88"
DEPENDS = "qtbase qtsvg qttools"
SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \
file://remove_rpath.patch \
"
# file://qwt6.patch
# file://qwt6-fix-linking-with-ld-gold.patch"
S = "${WORKDIR}/qwt-${PV}"
@@ -45,3 +44,5 @@ FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so"
FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug"
FILES_${PN}-doc += "${prefix}/doc"
INSANE_SKIP_${PN}-plugins += "libdir"

17
recipes-qt/qwt/qwt-qt5/remove_rpath.patch Normal file
View File

@@ -0,0 +1,17 @@
Remove rpath from library, it points to build area which is not
ok
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: qwt-6.1.3/designer/designer.pro
===================================================================
--- qwt-6.1.3.orig/designer/designer.pro
+++ qwt-6.1.3/designer/designer.pro
@@ -83,7 +83,6 @@ contains(QWT_CONFIG, QwtDesigner) {
# compile the path for finding the Qwt library
# into the plugin. Not supported on Windows !
- QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
contains(QWT_CONFIG, QwtDll) {