rpms
/
qt5-qttools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase clang patch

This commit is contained in:
Jan Grulich 2020-11-20 14:28:01 +01:00
parent 999edf6ab5
commit 7095c5d4f7
1 changed files with 70 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
View File

@ -1,31 +1,18 @@
From 3dfe3b966f3fb069f258991b6a468816aab13908 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 12 Dec 2019 22:47:04 +0000
Subject: [PATCH] Link against libclang-cpp.so instead of the clang component
libraries
---
src/qdoc/configure.pri | 56 +-----------------------------------------
1 file changed, 1 insertion(+), 55 deletions(-)
diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri
index e9d7667c..65470129 100644 index 4f3d776..bcd2aae 100644
--- a/src/qdoc/configure.pri --- a/src/qdoc/configure.pri
+++ b/src/qdoc/configure.pri +++ b/src/qdoc/configure.pri
@@ -142,61 +142,7 @@ defineTest(qtConfTest_libclang) { @@ -146,33 +146,6 @@ defineTest(qtConfTest_libclang) {
CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore }
} else { }
!equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group !equals(QMAKE_HOST.os, Darwin):!msvc: CLANG_LIBS+=-Wl,--start-group
- CLANG_LIBS += -lclangAnalysis \ - CLANG_LIBS += -lclangAnalysis \
- -lclangApplyReplacements \
- -lclangARCMigrate \ - -lclangARCMigrate \
- -lclangAST \ - -lclangAST \
- -lclangASTMatchers \ - -lclangASTMatchers \
- -lclangBasic \ - -lclangBasic \
- -lclangChangeNamespace \
- -lclangCodeGen \ - -lclangCodeGen \
- -lclangCrossTU \ - -lclangCrossTU \
- -lclangDaemon \
- -lclangDriver \ - -lclangDriver \
- -lclangDynamicASTMatchers \ - -lclangDynamicASTMatchers \
- -lclangEdit \ - -lclangEdit \
@ -33,22 +20,35 @@ index e9d7667c..65470129 100644
- -lclangFrontend \ - -lclangFrontend \
- -lclangFrontendTool \ - -lclangFrontendTool \
- -lclangHandleCXX \ - -lclangHandleCXX \
- -lclangIncludeFixer \
- -lclangIncludeFixerPlugin \
- -lclangIndex \ - -lclangIndex \
- -lclangLex \ - -lclangLex \
- -lclangMove \
- -lclangParse \ - -lclangParse \
- -lclangQuery \
- -lclangReorderFields \
- -lclangRewrite \ - -lclangRewrite \
- -lclangRewriteFrontend \ - -lclangRewriteFrontend \
- -lclangSema \ - -lclangSema \
- -lclangSerialization \ - -lclangSerialization \
- -lclang_static \
- -lclangStaticAnalyzerCheckers \ - -lclangStaticAnalyzerCheckers \
- -lclangStaticAnalyzerCore \ - -lclangStaticAnalyzerCore \
- -lclangStaticAnalyzerFrontend \ - -lclangStaticAnalyzerFrontend \
- -lclangTooling \
- -lclangToolingASTDiff \
- -lclangToolingCore
versionIsAtLeast($$CLANG_VERSION, "10.0.0") {
equals(QMAKE_HOST.os, Windows): \
@@ -187,34 +160,7 @@ defineTest(qtConfTest_libclang) {
else: \
CLANG_LIBS += -lclang_static
- CLANG_LIBS += \
- -lclangApplyReplacements \
- -lclangChangeNamespace \
- -lclangDaemon \
- -lclangIncludeFixer \
- -lclangIncludeFixerPlugin \
- -lclangMove \
- -lclangQuery \
- -lclangReorderFields \
- -lclangTidy \ - -lclangTidy \
- -lclangTidyAndroidModule \ - -lclangTidyAndroidModule \
- -lclangTidyBoostModule \ - -lclangTidyBoostModule \
@ -67,14 +67,8 @@ index e9d7667c..65470129 100644
- -lclangTidyPlugin \ - -lclangTidyPlugin \
- -lclangTidyReadabilityModule \ - -lclangTidyReadabilityModule \
- -lclangTidyUtils \ - -lclangTidyUtils \
- -lclangTooling \
- -lclangToolingASTDiff \
- -lclangToolingCore \
- -lclangToolingRefactor \ - -lclangToolingRefactor \
+ CLANG_LIBS += -lclang-cpp \ + CLANG_LIBS += -lclang-cpp \
-lfindAllSymbols \ -lfindAllSymbols
-lLLVMAArch64AsmParser \ }
-lLLVMAArch64AsmPrinter \
--
2.20.1