Fix misc issues

1 files changed, 35 insertions, 0 deletions

diff --git a/0017-Enable-rpath-for-build-tools.patch b/0017-Enable-rpath-for-build-tools.patch
new file mode 100644
index 000000000000..cecd335bba2c
--- /dev/null
+++ b/0017-Enable-rpath-for-build-tools.patch
@@ -0,0 +1,35 @@
+From 42cab8b3eec8eb5c8078ef8360a05b7835a533ba Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 18 Sep 2016 17:59:27 +0200
+Subject: [PATCH 17/26] Enable rpath for build tools
+
+- Required because library various tools depend on (libQt5Bootstrap.so) resides
+  in folder /usr/${_arch}/lib
+- Can't use regular lib dir because it would conflict with the native package
+---
+ 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 46aca50..e763602 100644
+--- a/mkspecs/features/qt_app.prf
++++ b/mkspecs/features/qt_app.prf
+@@ -20,6 +20,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:contains(QT_CONFIG, release_tools): CONFIG += release
+     contains(QT, core(-private)?|xml) {
+@@ -30,7 +31,6 @@ host_build:force_bootstrap {
+ } else {
+     !build_pass:contains(QT_CONFIG, 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.10.2
+