aboutsummarylogtreecommitdiffstats
path: root/0018-Enable-rpath-for-build-tools.patch
diff options
context:
space:
mode:
authorMartchus2017-06-08 21:34:00 +0200
committerMartchus2017-06-08 21:34:00 +0200
commit7173374d6cf10c3f3bfba0aeb3ffc9a792851a22 (patch)
tree323f39decf999a9a9a5ee9cde325633832b7691f /0018-Enable-rpath-for-build-tools.patch
parent359b0d47f7acead35fd6154db1663860ef829cbe (diff)
downloadaur-7173374d6cf10c3f3bfba0aeb3ffc9a792851a22.tar.gz
Update to 5.9.0
Diffstat (limited to '0018-Enable-rpath-for-build-tools.patch')
-rw-r--r--0018-Enable-rpath-for-build-tools.patch37
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..375b390777eb
--- /dev/null
+++ b/0018-Enable-rpath-for-build-tools.patch
@@ -0,0 +1,37 @@
+From 905438dce78dd9fb08692b81bfbed4caa30fd23e Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 18 Sep 2016 17:59:27 +0200
+Subject: [PATCH 18/31] 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 cb84ae0da8..8d9471ed0a 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:qtConfig(release_tools): CONFIG += release
+ contains(QT, core(-private)?|xml) {
+@@ -30,7 +31,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.13.0
+