mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
db82ecbefe
6988a2f097e9af50e1b4222550b2593bfc5685ea build: Update qt package up to 5.15.10 (Hennadii Stepanov) Pull request description: The Qt 5.15.10 contains at least three important for us fixes: -8bb90ab760, which allows us to drop the [`dont_hardcode_x86_64.patch`](fd8ab08558/depends/patches/qt/dont_hardcode_x86_64.patch) -8467beddb7, which allows us to drop the [`fix_montery_include.patch`](fd8ab08558/depends/patches/qt/fix_montery_include.patch) -df08a21fa4, which addresses https://github.com/bitcoin/bitcoin/pull/28349#issuecomment-1743519614 ACKs for top commit: fanquake: ACK 6988a2f097e9af50e1b4222550b2593bfc5685ea. Tree-SHA512: 838c44cf0d7508714f35887bb1f0983e59d96764f08f467bbd03d102d7152e797daeedc178afb03141115cc3be623e4ef7c4c4c65c0a8d1f0bb9702c9a6f8fc6
56 lines
2.4 KiB
Diff
56 lines
2.4 KiB
Diff
qmake: Don't error out if QMAKE_DEFAULT_LIBDIRS is empty on macOS
|
|
|
|
The new linker in Xcode 15 doesn't provide any default linker or
|
|
framework paths when requested via -v, but still seems to use the
|
|
default paths documented in the ld man page.
|
|
|
|
We trust that linker will do the right thing, even if we don't
|
|
know of its default linker paths.
|
|
|
|
We also need to opt out of the default fallback logic to
|
|
set the libdirs to /lib and /usr/lib.
|
|
|
|
This may result in UnixMakefileGenerator::findLibraries finding
|
|
different libraries than expected, if additional paths are
|
|
passed with -L, which will then take precedence for qmake,
|
|
even if the linker itself will use the library from the
|
|
SDK's default paths. This should hopefully not be an issue
|
|
in practice, as we don't turn -lFoo into absolute paths in
|
|
qmake, so the only risk is that we're picking up the wrong
|
|
prl files and adding additional dependencies that the lib
|
|
in the SDK doesn't have.
|
|
|
|
Upstream commits:
|
|
- Qt 5.15.16: Not yet publicly available.
|
|
- Qt dev: cdf64b0e47115cc473e1afd1472b4b09e130b2a5
|
|
|
|
For other Qt branches see
|
|
https://codereview.qt-project.org/q/I2347b26e2df0828471373b0e15b8c9089274c65d
|
|
|
|
--- old/qtbase/mkspecs/features/toolchain.prf
|
|
+++ new/qtbase/mkspecs/features/toolchain.prf
|
|
@@ -288,9 +288,12 @@ isEmpty($${target_prefix}.INCDIRS) {
|
|
}
|
|
}
|
|
}
|
|
- isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
|
|
+ isEmpty(QMAKE_DEFAULT_INCDIRS): \
|
|
!integrity: \
|
|
- error("failed to parse default search paths from compiler output")
|
|
+ error("failed to parse default include paths from compiler output")
|
|
+ isEmpty(QMAKE_DEFAULT_LIBDIRS): \
|
|
+ !integrity:!darwin: \
|
|
+ error("failed to parse default library paths from compiler output")
|
|
QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
|
|
} else: ghs {
|
|
cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
|
|
@@ -412,7 +415,7 @@ isEmpty($${target_prefix}.INCDIRS) {
|
|
QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
|
|
}
|
|
|
|
- unix:if(!cross_compile|host_build) {
|
|
+ unix:!darwin:if(!cross_compile|host_build) {
|
|
isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
|
|
isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
|
|
}
|