diff options
Diffstat (limited to 'recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch')
-rw-r--r-- | recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch b/recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch new file mode 100644 index 00000000..fa63c347 --- /dev/null +++ b/recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch @@ -0,0 +1,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 + |