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