mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 05:29:15 +08:00
4215306d07
- at-spi2-core used to be satisfied by a system package in the linux CI image, noticed in the host build in android CI. - dbus used to be provided by a system dev package in the linux CI. The automatic configuration chooses "linked" mode in this case. With the system package remove from CI, this auto configuration created an installation order dependency due to the lack of a dbus dependency. Noticed in some CI runs, e.g. https://github.com/microsoft/vcpkg/pull/38618. - libclang probably became a dependency for qdoc with 5.15, but nobody noticed. - pcre2 has a default feature jit which is causing problems, #38604. This PR unblocks opt-put from pcre2[jit] in qt5-base. --------- Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Co-authored-by: Monica <liuyumei01@beyondsoft.com>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri
|
|
index 4f3d776..547d6a6 100644
|
|
--- a/src/qdoc/configure.pri
|
|
+++ b/src/qdoc/configure.pri
|
|
@@ -87,10 +87,7 @@ defineTest(qtConfTest_libclang) {
|
|
}
|
|
LLVM_INSTALL_DIR = $$clean_path($$LLVM_INSTALL_DIR)
|
|
|
|
- contains(QMAKE_HOST.arch, x86_64): \
|
|
- clangInstallDir = $$replace(LLVM_INSTALL_DIR, _ARCH_, 64)
|
|
- else: \
|
|
- clangInstallDir = $$replace(LLVM_INSTALL_DIR, _ARCH_, 32)
|
|
+ clangInstallDir = $$LLVM_INSTALL_DIR
|
|
isEmpty(LLVM_INSTALL_DIR) {
|
|
win32 {
|
|
return(false)
|
|
@@ -113,7 +110,13 @@ defineTest(qtConfTest_libclang) {
|
|
} else {
|
|
CLANG_LIBDIR = $$clangInstallDir/lib
|
|
CLANG_INCLUDEPATH = $$clangInstallDir/include
|
|
+ exists($$clangInstallDir/tools/llvm): {
|
|
+ output = $$system("$$clangInstallDir/tools/llvm/llvm-config --version")
|
|
+ CLANG_VERSION = $$extractVersion($$output)
|
|
+ }
|
|
+ else: {
|
|
CLANG_VERSION = $$findLLVMVersionFromLibDir($$CLANG_LIBDIR)
|
|
+ }
|
|
}
|
|
isEmpty(CLANG_VERSION) {
|
|
!isEmpty(LLVM_INSTALL_DIR): \
|