69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
|
From 30d3906ff5e8671e9c97c5336c6c549656c0e293 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
|
||
|
|
Date: Sat, 4 Apr 2020 00:27:41 +0200
|
||
|
|
Subject: [PATCH 04/11] qtbase-replace-libdir
|
||
|
|
|
||
|
|
---
|
||
|
|
mkspecs/features/qt_common.prf | 20 ++------------------
|
||
|
|
mkspecs/features/qt_module.prf | 5 +----
|
||
|
|
2 files changed, 3 insertions(+), 22 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
|
||
|
|
index 8df94aa4ee..414029f31c 100644
|
||
|
|
--- a/mkspecs/features/qt_common.prf
|
||
|
|
+++ b/mkspecs/features/qt_common.prf
|
||
|
|
@@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib)|contains(TEMPLATE, aux) {
|
||
|
|
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
|
||
|
|
else: \
|
||
|
|
rplbase = $$MODULE_BASE_OUTDIR
|
||
|
|
- host_build {
|
||
|
|
- qqt_libdir = \$\$\$\$[QT_HOST_LIBS]
|
||
|
|
- qt_libdir = $$[QT_HOST_LIBS]
|
||
|
|
- } else {
|
||
|
|
- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS]
|
||
|
|
- qt_libdir = $$[QT_INSTALL_LIBS]
|
||
|
|
- }
|
||
|
|
+ qt_libdir = $$NIX_OUTPUT_OUT/lib
|
||
|
|
contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
|
||
|
|
- lib_replace0.match = $$rplbase/lib/
|
||
|
|
- lib_replace0.replace = $$qqt_libdir/
|
||
|
|
- lib_replace0.CONFIG = path
|
||
|
|
- QMAKE_PRL_INSTALL_REPLACE += lib_replace0
|
||
|
|
lib_replace.match = "[^ ']*$$rplbase/lib"
|
||
|
|
lib_replace.replace =
|
||
|
|
} else {
|
||
|
|
lib_replace.match = $$rplbase/lib
|
||
|
|
- lib_replace.replace = $$qqt_libdir
|
||
|
|
+ lib_replace.replace = $$qt_libdir
|
||
|
|
}
|
||
|
|
lib_replace.CONFIG = path
|
||
|
|
QMAKE_PRL_INSTALL_REPLACE += lib_replace
|
||
|
|
- !equals(qt_libdir, $$rplbase/lib) {
|
||
|
|
- qtlibdir_replace.match = $$qt_libdir
|
||
|
|
- qtlibdir_replace.replace = $$qqt_libdir
|
||
|
|
- qtlibdir_replace.CONFIG = path
|
||
|
|
- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace
|
||
|
|
- }
|
||
|
|
}
|
||
|
|
contains(TEMPLATE, .*lib)|darwin {
|
||
|
|
if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols
|
||
|
|
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||
|
|
index 828a9621b9..b9e5d35026 100644
|
||
|
|
--- a/mkspecs/features/qt_module.prf
|
||
|
|
+++ b/mkspecs/features/qt_module.prf
|
||
|
|
@@ -305,10 +305,7 @@ load(qt_targets)
|
||
|
|
}
|
||
|
|
!lib_bundle:unix {
|
||
|
|
CONFIG += create_libtool
|
||
|
|
- host_build: \
|
||
|
|
- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
|
||
|
|
- else: \
|
||
|
|
- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]"
|
||
|
|
+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib
|
||
|
|
!isEmpty(lib_replace0.match) {
|
||
|
|
ltlib_replace0.match = $$lib_replace0.match
|
||
|
|
ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
|
||
|
|
--
|
||
|
|
2.25.4
|
||
|
|
|