2019-02-02 18:18:25 +01:00
|
|
|
From 8ae9fed6ff5f5bf2e4c1d031baa7c03282268b35 Mon Sep 17 00:00:00 2001
|
2016-09-19 22:18:45 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Sun, 18 Sep 2016 17:59:27 +0200
|
2019-02-02 18:18:25 +01:00
|
|
|
Subject: [PATCH 18/34] Enable rpath for build tools
|
2016-09-19 22:18:45 +02:00
|
|
|
|
2017-06-02 18:20:04 +02:00
|
|
|
- Required because various tools depend on libQt5Bootstrap.so which resides
|
2016-09-19 22:18:45 +02:00
|
|
|
in folder /usr/${_arch}/lib
|
|
|
|
- Can't use regular lib dir because it would conflict with the native package
|
2017-06-02 18:20:04 +02:00
|
|
|
|
|
|
|
Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7
|
2016-09-19 22:18:45 +02:00
|
|
|
---
|
|
|
|
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
|
2018-12-08 22:06:32 +01:00
|
|
|
index 8354f30eea..30e8cf18c5 100644
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/mkspecs/features/qt_app.prf
|
|
|
|
+++ b/mkspecs/features/qt_app.prf
|
2018-12-08 22:06:32 +01:00
|
|
|
@@ -21,6 +21,7 @@ isEmpty(QMAKE_TARGET_DESCRIPTION): \
|
|
|
|
isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
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 {
|
2017-01-23 21:37:13 +01:00
|
|
|
!build_pass:qtConfig(release_tools): CONFIG += release
|
2016-09-19 22:18:45 +02:00
|
|
|
contains(QT, core(-private)?|xml) {
|
2018-12-08 22:06:32 +01:00
|
|
|
@@ -31,7 +32,6 @@ host_build:force_bootstrap {
|
2016-09-19 22:18:45 +02:00
|
|
|
} else {
|
2017-01-23 21:37:13 +01:00
|
|
|
!build_pass:qtConfig(debug_and_release): CONFIG += release
|
2016-09-19 22:18:45 +02:00
|
|
|
target.path = $$[QT_INSTALL_BINS]
|
|
|
|
- CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable
|
|
|
|
}
|
|
|
|
INSTALLS += target
|
|
|
|
|
|
|
|
--
|
2018-12-22 00:04:30 +01:00
|
|
|
2.20.1
|
2016-09-19 22:18:45 +02:00
|
|
|
|