diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-10 12:59:11 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-10 12:59:11 +0200 |
| commit | a41f9f632d5f87bb2b9999980d4fe3055770e1c6 (patch) | |
| tree | 075fc53f6644258914c925f0455eeceb4218c99a /dev-qt/qdoc | |
| parent | profiles: Mask media-libs/libprojectm-qt for removal (diff) | |
| download | gentoo-a41f9f632d5f87bb2b9999980d4fe3055770e1c6.tar.gz gentoo-a41f9f632d5f87bb2b9999980d4fe3055770e1c6.tar.bz2 gentoo-a41f9f632d5f87bb2b9999980d4fe3055770e1c6.zip | |
dev-qt/qdoc: Fix 5.11.0_rc upstream regression
Package-Manager: Portage-2.3.36, Repoman-2.3.9
Diffstat (limited to 'dev-qt/qdoc')
| -rw-r--r-- | dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch | 239 | ||||
| -rw-r--r-- | dev-qt/qdoc/qdoc-5.11.0_rc.ebuild | 2 |
2 files changed, 241 insertions, 0 deletions
diff --git a/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch b/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch new file mode 100644 index 000000000000..e5496019b8e5 --- /dev/null +++ b/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch @@ -0,0 +1,239 @@ +Reverting upstream regression. + + +From fddf7ee536e4fd0061d0ee933707881cebe54223 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@qt.io> +Date: Wed, 18 Apr 2018 13:35:10 +0200 +Subject: Link qdoc to static libclang + +Done-with: Mikhail Svetkin <mikhail.svetkin@qt.io> +Change-Id: Ifbd4e1b27f658f7d4f287a8a51f0cda54814e754 +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> +--- + mkspecs/features/qt_find_clang.prf | 197 ------------------------------------+ + src/qdoc/qdoc.pro | 8 -- + 2 files changed, 3 insertions(+), 202 deletions(-) + +--- a/mkspecs/features/qt_find_clang.prf 2018-05-03 13:02:49.000000000 +0200 ++++ b/mkspecs/features/qt_find_clang.prf 2018-05-10 12:54:26.778546039 +0200 +@@ -90,200 +90,9 @@ + + !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR): CLANG_LIBS = -L$${CLANG_LIBDIR} + equals(QMAKE_HOST.os, Windows): \ +- CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore +- else: { +- !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group +- CLANG_LIBS += -lclangAnalysis \ +- -lclangApplyReplacements \ +- -lclangARCMigrate \ +- -lclangAST \ +- -lclangASTMatchers \ +- -lclangBasic \ +- -lclangChangeNamespace \ +- -lclangCodeGen \ +- -lclangCrossTU \ +- -lclangDaemon \ +- -lclangDriver \ +- -lclangDynamicASTMatchers \ +- -lclangEdit \ +- -lclangFormat \ +- -lclangFrontend \ +- -lclangFrontendTool \ +- -lclangHandleCXX \ +- -lclangIncludeFixer \ +- -lclangIncludeFixerPlugin \ +- -lclangIndex \ +- -lclangLex \ +- -lclangMove \ +- -lclangParse \ +- -lclangQuery \ +- -lclangReorderFields \ +- -lclangRewrite \ +- -lclangRewriteFrontend \ +- -lclangSema \ +- -lclangSerialization \ +- -lclang_static \ +- -lclangStaticAnalyzerCheckers \ +- -lclangStaticAnalyzerCore \ +- -lclangStaticAnalyzerFrontend \ +- -lclangTidy \ +- -lclangTidyAndroidModule \ +- -lclangTidyBoostModule \ +- -lclangTidyBugproneModule \ +- -lclangTidyCERTModule \ +- -lclangTidyCppCoreGuidelinesModule \ +- -lclangTidyFuchsiaModule \ +- -lclangTidyGoogleModule \ +- -lclangTidyHICPPModule \ +- -lclangTidyLLVMModule \ +- -lclangTidyMiscModule \ +- -lclangTidyModernizeModule \ +- -lclangTidyMPIModule \ +- -lclangTidyObjCModule \ +- -lclangTidyPerformanceModule \ +- -lclangTidyPlugin \ +- -lclangTidyReadabilityModule \ +- -lclangTidyUtils \ +- -lclangTooling \ +- -lclangToolingASTDiff \ +- -lclangToolingCore \ +- -lclangToolingRefactor \ +- -lfindAllSymbols \ +- -lLLVMAArch64AsmParser \ +- -lLLVMAArch64AsmPrinter \ +- -lLLVMAArch64CodeGen \ +- -lLLVMAArch64Desc \ +- -lLLVMAArch64Disassembler \ +- -lLLVMAArch64Info \ +- -lLLVMAArch64Utils \ +- -lLLVMAMDGPUAsmParser \ +- -lLLVMAMDGPUAsmPrinter \ +- -lLLVMAMDGPUCodeGen \ +- -lLLVMAMDGPUDesc \ +- -lLLVMAMDGPUDisassembler \ +- -lLLVMAMDGPUInfo \ +- -lLLVMAMDGPUUtils \ +- -lLLVMAnalysis \ +- -lLLVMARMAsmParser \ +- -lLLVMARMAsmPrinter \ +- -lLLVMARMCodeGen \ +- -lLLVMARMDesc \ +- -lLLVMARMDisassembler \ +- -lLLVMARMInfo \ +- -lLLVMARMUtils \ +- -lLLVMAsmParser \ +- -lLLVMAsmPrinter \ +- -lLLVMBinaryFormat \ +- -lLLVMBitReader \ +- -lLLVMBitWriter \ +- -lLLVMBPFAsmParser \ +- -lLLVMBPFAsmPrinter \ +- -lLLVMBPFCodeGen \ +- -lLLVMBPFDesc \ +- -lLLVMBPFDisassembler \ +- -lLLVMBPFInfo \ +- -lLLVMCodeGen \ +- -lLLVMCore \ +- -lLLVMCoroutines \ +- -lLLVMCoverage \ +- -lLLVMDebugInfoCodeView \ +- -lLLVMDebugInfoDWARF \ +- -lLLVMDebugInfoMSF \ +- -lLLVMDebugInfoPDB \ +- -lLLVMDemangle \ +- -lLLVMDlltoolDriver \ +- -lLLVMExecutionEngine \ +- -lLLVMFuzzMutate \ +- -lLLVMGlobalISel \ +- -lLLVMHexagonAsmParser \ +- -lLLVMHexagonCodeGen \ +- -lLLVMHexagonDesc \ +- -lLLVMHexagonDisassembler \ +- -lLLVMHexagonInfo \ +- -lLLVMInstCombine \ +- -lLLVMInstrumentation \ +- -lLLVMInterpreter \ +- -lLLVMipo \ +- -lLLVMIRReader \ +- -lLLVMLanaiAsmParser \ +- -lLLVMLanaiAsmPrinter \ +- -lLLVMLanaiCodeGen \ +- -lLLVMLanaiDesc \ +- -lLLVMLanaiDisassembler \ +- -lLLVMLanaiInfo \ +- -lLLVMLibDriver \ +- -lLLVMLineEditor \ +- -lLLVMLinker \ +- -lLLVMLTO \ +- -lLLVMMC \ +- -lLLVMMCDisassembler \ +- -lLLVMMCJIT \ +- -lLLVMMCParser \ +- -lLLVMMipsAsmParser \ +- -lLLVMMipsAsmPrinter \ +- -lLLVMMipsCodeGen \ +- -lLLVMMipsDesc \ +- -lLLVMMipsDisassembler \ +- -lLLVMMipsInfo \ +- -lLLVMMIRParser \ +- -lLLVMMSP430AsmPrinter \ +- -lLLVMMSP430CodeGen \ +- -lLLVMMSP430Desc \ +- -lLLVMMSP430Info \ +- -lLLVMNVPTXAsmPrinter \ +- -lLLVMNVPTXCodeGen \ +- -lLLVMNVPTXDesc \ +- -lLLVMNVPTXInfo \ +- -lLLVMObjCARCOpts \ +- -lLLVMObject \ +- -lLLVMObjectYAML \ +- -lLLVMOption \ +- -lLLVMOrcJIT \ +- -lLLVMPasses \ +- -lLLVMPowerPCAsmParser \ +- -lLLVMPowerPCAsmPrinter \ +- -lLLVMPowerPCCodeGen \ +- -lLLVMPowerPCDesc \ +- -lLLVMPowerPCDisassembler \ +- -lLLVMPowerPCInfo \ +- -lLLVMProfileData \ +- -lLLVMRuntimeDyld \ +- -lLLVMScalarOpts \ +- -lLLVMSelectionDAG \ +- -lLLVMSparcAsmParser \ +- -lLLVMSparcAsmPrinter \ +- -lLLVMSparcCodeGen \ +- -lLLVMSparcDesc \ +- -lLLVMSparcDisassembler \ +- -lLLVMSparcInfo \ +- -lLLVMSupport \ +- -lLLVMSymbolize \ +- -lLLVMSystemZAsmParser \ +- -lLLVMSystemZAsmPrinter \ +- -lLLVMSystemZCodeGen \ +- -lLLVMSystemZDesc \ +- -lLLVMSystemZDisassembler \ +- -lLLVMSystemZInfo \ +- -lLLVMTableGen \ +- -lLLVMTarget \ +- -lLLVMTransformUtils \ +- -lLLVMVectorize \ +- -lLLVMWindowsManifest \ +- -lLLVMX86AsmParser \ +- -lLLVMX86AsmPrinter \ +- -lLLVMX86CodeGen \ +- -lLLVMX86Desc \ +- -lLLVMX86Disassembler \ +- -lLLVMX86Info \ +- -lLLVMX86Utils \ +- -lLLVMXCoreAsmPrinter \ +- -lLLVMXCoreCodeGen \ +- -lLLVMXCoreDesc \ +- -lLLVMXCoreDisassembler \ +- -lLLVMXCoreInfo \ +- -lLLVMXRay +- !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--end-group +- } ++ CLANG_LIBS += -llibclang -ladvapi32 -lshell32 ++ else: \ ++ CLANG_LIBS += -lclang + + !versionIsAtLeast($$CLANG_VERSION, "3.9.0") { + log("LLVM/Clang version >= 3.9.0 required, version provided: $${CLANG_VERSION}.$$escape_expand(\\n)") +--- a/src/qdoc/qdoc.pro 2018-05-10 12:51:22.832458913 +0200 ++++ b/src/qdoc/qdoc.pro 2018-05-10 12:54:27.746557021 +0200 +@@ -15,14 +15,6 @@ + LIBS += $$CLANG_LIBS + !contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH + +-# Support static libclang linking on different platforms +-equals(QMAKE_HOST.os, Windows): { +- DEFINES += CINDEX_LINKAGE= +-} else { +- LIBS += -lz -ldl +- equals(QMAKE_HOST.os, Darwin): LIBS += -lcurses -lm -lxml2 +-} +- + !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR):!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR + DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"$${CLANG_LIBDIR}/clang/$${CLANG_VERSION}/include\") + diff --git a/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild b/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild index 4c656e1bf9f6..2d1c8473347a 100644 --- a/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild +++ b/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild @@ -24,6 +24,8 @@ QT5_TARGET_SUBDIRS=( src/qdoc ) +PATCHES=( "${FILESDIR}/${PN}-5.11.0-revert-static-clang.patch" ) + src_prepare() { qt_use_disable_mod qml qmldevtools-private \ src/qdoc/qdoc.pro |