summarylogtreecommitdiffstats
path: root/0016-Enable-rpath-for-build-tools.patch
diff options
context:
space:
mode:
authorMartchus2019-06-26 14:41:44 +0200
committerMartchus2019-06-26 14:41:44 +0200
commitb69d649de83fd8d7d746d62c2e507dc07428dd89 (patch)
treeb6b09efd73d25009ff338a0c68e06aff03fcd1db /0016-Enable-rpath-for-build-tools.patch
parent2b8615f4a00551d5cb2f0df7665064342c97d03e (diff)
downloadaur-b69d649de83fd8d7d746d62c2e507dc07428dd89.tar.gz
Update to 5.13.0
Diffstat (limited to '0016-Enable-rpath-for-build-tools.patch')
-rw-r--r--0016-Enable-rpath-for-build-tools.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
new file mode 100644
index 00000000000..59595f2cb05
--- /dev/null
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -0,0 +1,37 @@
+From a2a8aa60a4385fff2770e93e0a6054935905bef7 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 18 Sep 2016 17:59:27 +0200
+Subject: [PATCH 16/33] 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 8354f30eea..30e8cf18c5 100644
+--- a/mkspecs/features/qt_app.prf
++++ b/mkspecs/features/qt_app.prf
+@@ -21,6 +21,7 @@ isEmpty(QMAKE_TARGET_DESCRIPTION): \
+ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
+
+ 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) {
+@@ -31,7 +32,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.22.0
+