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