qwt-qt5: Fix rpath issues

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>

2 files changed, 20 insertions, 2 deletions

diff --git a/recipes-qt/qwt/qwt-qt5.inc b/recipes-qt/qwt/qwt-qt5.inc
index ee4fbd77..90bd9f72 100644
--- a/recipes-qt/qwt/qwt-qt5.inc
+++ b/recipes-qt/qwt/qwt-qt5.inc
@@ -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"
+
diff --git a/recipes-qt/qwt/qwt-qt5/remove_rpath.patch b/recipes-qt/qwt/qwt-qt5/remove_rpath.patch
new file mode 100644
index 00000000..14b65d6a
--- /dev/null
+++ b/recipes-qt/qwt/qwt-qt5/remove_rpath.patch
@@ -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) {