1From ff950c71bf841a4d62952aac72f3c5a830cf9cff Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Wed, 29 Nov 2017 22:31:07 +0100
4Subject: [PATCH] Remove rpath from binaries - they point to buuild area
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9This is a rework of the patch submitted by Khem Raj.
10
11Upstream-Status: Inappropriate [OE specific]
12
13Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
14---
15 designer/designer.pro     | 1 -
16 examples/examples.pri     | 1 -
17 playground/playground.pri | 1 -
18 qwt.prf                   | 1 -
19 4 files changed, 4 deletions(-)
20
21diff --git a/designer/designer.pro b/designer/designer.pro
22index 7d44a44..a11847d 100644
23--- a/designer/designer.pro
24+++ b/designer/designer.pro
25@@ -83,7 +83,6 @@ contains(QWT_CONFIG, QwtDesigner) {
26         # compile the path for finding the Qwt library
27         # into the plugin. Not supported on Windows !
28
29-        QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
30         qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
31
32         contains(QWT_CONFIG, QwtDll) {
33diff --git a/examples/examples.pri b/examples/examples.pri
34index 200b188..b7776a8 100644
35--- a/examples/examples.pri
36+++ b/examples/examples.pri
37@@ -34,7 +34,6 @@ else {
38     }
39 }
40
41-QMAKE_RPATHDIR *= $${QWT_OUT_ROOT}/lib
42 qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
43
44 greaterThan(QT_MAJOR_VERSION, 4) {
45diff --git a/playground/playground.pri b/playground/playground.pri
46index c544360..fd0275f 100644
47--- a/playground/playground.pri
48+++ b/playground/playground.pri
49@@ -35,7 +35,6 @@ else {
50 }
51
52
53-QMAKE_RPATHDIR *= $${QWT_ROOT}/lib
54 qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
55
56 greaterThan(QT_MAJOR_VERSION, 4) {
57diff --git a/qwt.prf b/qwt.prf
58index 2625b31..7860153 100644
59--- a/qwt.prf
60+++ b/qwt.prf
61@@ -33,5 +33,4 @@ else {
62     INCLUDEPATH *= $${QWT_INSTALL_HEADERS}
63 }
64
65-# QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
66 qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt)
67--
682.9.5
69
70