summarylogtreecommitdiffstats
path: root/0016-Enable-rpath-for-build-tools.patch
blob: 830542acf2a815f1476ad4206efb5cbd4f5aae9a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From 2ed621b725a48cf41a4fd39cbb0723de1724b519 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.23.0