import

1 files changed, 37 insertions, 0 deletions

diff --git a/0018-Enable-rpath-for-build-tools.patch b/0018-Enable-rpath-for-build-tools.patch
new file mode 100644
index 000000000000..499eab9484ae
--- /dev/null
+++ b/0018-Enable-rpath-for-build-tools.patch
@@ -0,0 +1,37 @@
+From 056173285f8854856cb9d710cc7af0cfb67ed294 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 18 Sep 2016 17:59:27 +0200
+Subject: [PATCH 18/32] Enable rpath for build tools
+
+- Required because various tools depend on libQt5Bootstrap.so which resides
+  in folder /usr/${_arch}/lib
+- Can't use regular lib dir because it would conflict with the native package
+
+Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7
+---
+ mkspecs/features/qt_app.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
+index 883f8ca215..786f2e660c 100644
+--- a/mkspecs/features/qt_app.prf
++++ b/mkspecs/features/qt_app.prf
+@@ -24,6 +24,7 @@ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
+ QMAKE_LFLAGS += $$QMAKE_LFLAGS_GCSECTIONS
+ 
+ host_build: QT -= gui   # no host tool will ever use gui
++host_build: QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev] # force rpath
+ host_build:force_bootstrap {
+     !build_pass:qtConfig(release_tools): CONFIG += release
+     contains(QT, core(-private)?|xml) {
+@@ -34,7 +35,6 @@ host_build:force_bootstrap {
+ } else {
+     !build_pass:qtConfig(debug_and_release): CONFIG += release
+     target.path = $$[QT_INSTALL_BINS]
+-    CONFIG += relative_qt_rpath  # Qt's tools and apps should be relocatable
+ }
+ INSTALLS += target
+ 
+-- 
+2.16.1
+