[oe,meta-qt5] qwt-qt5: Fix rpath issues

Message ID 20170711063102.10384-1-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj July 11, 2017, 6:31 a.m.
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>

---
 recipes-qt/qwt/qwt-qt5.inc                |  5 +++--
 recipes-qt/qwt/qwt-qt5/remove_rpath.patch | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 recipes-qt/qwt/qwt-qt5/remove_rpath.patch

-- 
2.13.2

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Martin Jansa July 20, 2017, 10:39 a.m. | #1
I still see QA warning from this one just on .debug file now:


qwt-qt5-6.1.3: qwt-qt5-dbg: found library in wrong location:
/usr/plugins/designer/.debug/libqwt_designer_plugin.so [libdir]


On Tue, Jul 11, 2017 at 8:31 AM, Khem Raj <raj.khem@gmail.com> wrote:

> 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>

> ---

>  recipes-qt/qwt/qwt-qt5.inc                |  5 +++--

>  recipes-qt/qwt/qwt-qt5/remove_rpath.patch | 17 +++++++++++++++++

>  2 files changed, 20 insertions(+), 2 deletions(-)

>  create mode 100644 recipes-qt/qwt/qwt-qt5/remove_rpath.patch

>

> diff --git a/recipes-qt/qwt/qwt-qt5.inc b/recipes-qt/qwt/qwt-qt5.inc

> index ee4fbd7..90bd9f7 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 0000000..14b65d6

> --- /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) {

> --

> 2.13.2

>

> --

> _______________________________________________

> Openembedded-devel mailing list

> Openembedded-devel@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

>

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Khem Raj July 20, 2017, 3:05 p.m. | #2
On Thu, Jul 20, 2017 at 6:39 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> I still see QA warning from this one just on .debug file now:

>

>

> qwt-qt5-6.1.3: qwt-qt5-dbg: found library in wrong location:

> /usr/plugins/designer/.debug/libqwt_designer_plugin.so [libdir]

>


OK I guess we also need

INSANE_SKIP_${PN}-dbg += "libdir"

>

> On Tue, Jul 11, 2017 at 8:31 AM, Khem Raj <raj.khem@gmail.com> wrote:

>>

>> 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>

>> ---

>>  recipes-qt/qwt/qwt-qt5.inc                |  5 +++--

>>  recipes-qt/qwt/qwt-qt5/remove_rpath.patch | 17 +++++++++++++++++

>>  2 files changed, 20 insertions(+), 2 deletions(-)

>>  create mode 100644 recipes-qt/qwt/qwt-qt5/remove_rpath.patch

>>

>> diff --git a/recipes-qt/qwt/qwt-qt5.inc b/recipes-qt/qwt/qwt-qt5.inc

>> index ee4fbd7..90bd9f7 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 0000000..14b65d6

>> --- /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) {

>> --

>> 2.13.2

>>

>> --

>> _______________________________________________

>> Openembedded-devel mailing list

>> Openembedded-devel@lists.openembedded.org

>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

>

>

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes-qt/qwt/qwt-qt5.inc b/recipes-qt/qwt/qwt-qt5.inc
index ee4fbd7..90bd9f7 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 0000000..14b65d6
--- /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) {