| 1 |
commit: a41f9f632d5f87bb2b9999980d4fe3055770e1c6 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 10 10:59:11 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 10 10:59:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41f9f63 |
| 7 |
|
| 8 |
dev-qt/qdoc: Fix 5.11.0_rc upstream regression |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../files/qdoc-5.11.0-revert-static-clang.patch | 239 +++++++++++++++++++++ |
| 13 |
dev-qt/qdoc/qdoc-5.11.0_rc.ebuild | 2 + |
| 14 |
2 files changed, 241 insertions(+) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..e5496019b8e |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch |
| 21 |
@@ -0,0 +1,239 @@ |
| 22 |
+Reverting upstream regression. |
| 23 |
+ |
| 24 |
+ |
| 25 |
+From fddf7ee536e4fd0061d0ee933707881cebe54223 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@××.io> |
| 27 |
+Date: Wed, 18 Apr 2018 13:35:10 +0200 |
| 28 |
+Subject: Link qdoc to static libclang |
| 29 |
+ |
| 30 |
+Done-with: Mikhail Svetkin <mikhail.svetkin@××.io> |
| 31 |
+Change-Id: Ifbd4e1b27f658f7d4f287a8a51f0cda54814e754 |
| 32 |
+Reviewed-by: Simon Hausmann <simon.hausmann@××.io> |
| 33 |
+--- |
| 34 |
+ mkspecs/features/qt_find_clang.prf | 197 ------------------------------------+ |
| 35 |
+ src/qdoc/qdoc.pro | 8 -- |
| 36 |
+ 2 files changed, 3 insertions(+), 202 deletions(-) |
| 37 |
+ |
| 38 |
+--- a/mkspecs/features/qt_find_clang.prf 2018-05-03 13:02:49.000000000 +0200 |
| 39 |
++++ b/mkspecs/features/qt_find_clang.prf 2018-05-10 12:54:26.778546039 +0200 |
| 40 |
+@@ -90,200 +90,9 @@ |
| 41 |
+ |
| 42 |
+ !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR): CLANG_LIBS = -L$${CLANG_LIBDIR} |
| 43 |
+ equals(QMAKE_HOST.os, Windows): \ |
| 44 |
+- CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore |
| 45 |
+- else: { |
| 46 |
+- !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group |
| 47 |
+- CLANG_LIBS += -lclangAnalysis \ |
| 48 |
+- -lclangApplyReplacements \ |
| 49 |
+- -lclangARCMigrate \ |
| 50 |
+- -lclangAST \ |
| 51 |
+- -lclangASTMatchers \ |
| 52 |
+- -lclangBasic \ |
| 53 |
+- -lclangChangeNamespace \ |
| 54 |
+- -lclangCodeGen \ |
| 55 |
+- -lclangCrossTU \ |
| 56 |
+- -lclangDaemon \ |
| 57 |
+- -lclangDriver \ |
| 58 |
+- -lclangDynamicASTMatchers \ |
| 59 |
+- -lclangEdit \ |
| 60 |
+- -lclangFormat \ |
| 61 |
+- -lclangFrontend \ |
| 62 |
+- -lclangFrontendTool \ |
| 63 |
+- -lclangHandleCXX \ |
| 64 |
+- -lclangIncludeFixer \ |
| 65 |
+- -lclangIncludeFixerPlugin \ |
| 66 |
+- -lclangIndex \ |
| 67 |
+- -lclangLex \ |
| 68 |
+- -lclangMove \ |
| 69 |
+- -lclangParse \ |
| 70 |
+- -lclangQuery \ |
| 71 |
+- -lclangReorderFields \ |
| 72 |
+- -lclangRewrite \ |
| 73 |
+- -lclangRewriteFrontend \ |
| 74 |
+- -lclangSema \ |
| 75 |
+- -lclangSerialization \ |
| 76 |
+- -lclang_static \ |
| 77 |
+- -lclangStaticAnalyzerCheckers \ |
| 78 |
+- -lclangStaticAnalyzerCore \ |
| 79 |
+- -lclangStaticAnalyzerFrontend \ |
| 80 |
+- -lclangTidy \ |
| 81 |
+- -lclangTidyAndroidModule \ |
| 82 |
+- -lclangTidyBoostModule \ |
| 83 |
+- -lclangTidyBugproneModule \ |
| 84 |
+- -lclangTidyCERTModule \ |
| 85 |
+- -lclangTidyCppCoreGuidelinesModule \ |
| 86 |
+- -lclangTidyFuchsiaModule \ |
| 87 |
+- -lclangTidyGoogleModule \ |
| 88 |
+- -lclangTidyHICPPModule \ |
| 89 |
+- -lclangTidyLLVMModule \ |
| 90 |
+- -lclangTidyMiscModule \ |
| 91 |
+- -lclangTidyModernizeModule \ |
| 92 |
+- -lclangTidyMPIModule \ |
| 93 |
+- -lclangTidyObjCModule \ |
| 94 |
+- -lclangTidyPerformanceModule \ |
| 95 |
+- -lclangTidyPlugin \ |
| 96 |
+- -lclangTidyReadabilityModule \ |
| 97 |
+- -lclangTidyUtils \ |
| 98 |
+- -lclangTooling \ |
| 99 |
+- -lclangToolingASTDiff \ |
| 100 |
+- -lclangToolingCore \ |
| 101 |
+- -lclangToolingRefactor \ |
| 102 |
+- -lfindAllSymbols \ |
| 103 |
+- -lLLVMAArch64AsmParser \ |
| 104 |
+- -lLLVMAArch64AsmPrinter \ |
| 105 |
+- -lLLVMAArch64CodeGen \ |
| 106 |
+- -lLLVMAArch64Desc \ |
| 107 |
+- -lLLVMAArch64Disassembler \ |
| 108 |
+- -lLLVMAArch64Info \ |
| 109 |
+- -lLLVMAArch64Utils \ |
| 110 |
+- -lLLVMAMDGPUAsmParser \ |
| 111 |
+- -lLLVMAMDGPUAsmPrinter \ |
| 112 |
+- -lLLVMAMDGPUCodeGen \ |
| 113 |
+- -lLLVMAMDGPUDesc \ |
| 114 |
+- -lLLVMAMDGPUDisassembler \ |
| 115 |
+- -lLLVMAMDGPUInfo \ |
| 116 |
+- -lLLVMAMDGPUUtils \ |
| 117 |
+- -lLLVMAnalysis \ |
| 118 |
+- -lLLVMARMAsmParser \ |
| 119 |
+- -lLLVMARMAsmPrinter \ |
| 120 |
+- -lLLVMARMCodeGen \ |
| 121 |
+- -lLLVMARMDesc \ |
| 122 |
+- -lLLVMARMDisassembler \ |
| 123 |
+- -lLLVMARMInfo \ |
| 124 |
+- -lLLVMARMUtils \ |
| 125 |
+- -lLLVMAsmParser \ |
| 126 |
+- -lLLVMAsmPrinter \ |
| 127 |
+- -lLLVMBinaryFormat \ |
| 128 |
+- -lLLVMBitReader \ |
| 129 |
+- -lLLVMBitWriter \ |
| 130 |
+- -lLLVMBPFAsmParser \ |
| 131 |
+- -lLLVMBPFAsmPrinter \ |
| 132 |
+- -lLLVMBPFCodeGen \ |
| 133 |
+- -lLLVMBPFDesc \ |
| 134 |
+- -lLLVMBPFDisassembler \ |
| 135 |
+- -lLLVMBPFInfo \ |
| 136 |
+- -lLLVMCodeGen \ |
| 137 |
+- -lLLVMCore \ |
| 138 |
+- -lLLVMCoroutines \ |
| 139 |
+- -lLLVMCoverage \ |
| 140 |
+- -lLLVMDebugInfoCodeView \ |
| 141 |
+- -lLLVMDebugInfoDWARF \ |
| 142 |
+- -lLLVMDebugInfoMSF \ |
| 143 |
+- -lLLVMDebugInfoPDB \ |
| 144 |
+- -lLLVMDemangle \ |
| 145 |
+- -lLLVMDlltoolDriver \ |
| 146 |
+- -lLLVMExecutionEngine \ |
| 147 |
+- -lLLVMFuzzMutate \ |
| 148 |
+- -lLLVMGlobalISel \ |
| 149 |
+- -lLLVMHexagonAsmParser \ |
| 150 |
+- -lLLVMHexagonCodeGen \ |
| 151 |
+- -lLLVMHexagonDesc \ |
| 152 |
+- -lLLVMHexagonDisassembler \ |
| 153 |
+- -lLLVMHexagonInfo \ |
| 154 |
+- -lLLVMInstCombine \ |
| 155 |
+- -lLLVMInstrumentation \ |
| 156 |
+- -lLLVMInterpreter \ |
| 157 |
+- -lLLVMipo \ |
| 158 |
+- -lLLVMIRReader \ |
| 159 |
+- -lLLVMLanaiAsmParser \ |
| 160 |
+- -lLLVMLanaiAsmPrinter \ |
| 161 |
+- -lLLVMLanaiCodeGen \ |
| 162 |
+- -lLLVMLanaiDesc \ |
| 163 |
+- -lLLVMLanaiDisassembler \ |
| 164 |
+- -lLLVMLanaiInfo \ |
| 165 |
+- -lLLVMLibDriver \ |
| 166 |
+- -lLLVMLineEditor \ |
| 167 |
+- -lLLVMLinker \ |
| 168 |
+- -lLLVMLTO \ |
| 169 |
+- -lLLVMMC \ |
| 170 |
+- -lLLVMMCDisassembler \ |
| 171 |
+- -lLLVMMCJIT \ |
| 172 |
+- -lLLVMMCParser \ |
| 173 |
+- -lLLVMMipsAsmParser \ |
| 174 |
+- -lLLVMMipsAsmPrinter \ |
| 175 |
+- -lLLVMMipsCodeGen \ |
| 176 |
+- -lLLVMMipsDesc \ |
| 177 |
+- -lLLVMMipsDisassembler \ |
| 178 |
+- -lLLVMMipsInfo \ |
| 179 |
+- -lLLVMMIRParser \ |
| 180 |
+- -lLLVMMSP430AsmPrinter \ |
| 181 |
+- -lLLVMMSP430CodeGen \ |
| 182 |
+- -lLLVMMSP430Desc \ |
| 183 |
+- -lLLVMMSP430Info \ |
| 184 |
+- -lLLVMNVPTXAsmPrinter \ |
| 185 |
+- -lLLVMNVPTXCodeGen \ |
| 186 |
+- -lLLVMNVPTXDesc \ |
| 187 |
+- -lLLVMNVPTXInfo \ |
| 188 |
+- -lLLVMObjCARCOpts \ |
| 189 |
+- -lLLVMObject \ |
| 190 |
+- -lLLVMObjectYAML \ |
| 191 |
+- -lLLVMOption \ |
| 192 |
+- -lLLVMOrcJIT \ |
| 193 |
+- -lLLVMPasses \ |
| 194 |
+- -lLLVMPowerPCAsmParser \ |
| 195 |
+- -lLLVMPowerPCAsmPrinter \ |
| 196 |
+- -lLLVMPowerPCCodeGen \ |
| 197 |
+- -lLLVMPowerPCDesc \ |
| 198 |
+- -lLLVMPowerPCDisassembler \ |
| 199 |
+- -lLLVMPowerPCInfo \ |
| 200 |
+- -lLLVMProfileData \ |
| 201 |
+- -lLLVMRuntimeDyld \ |
| 202 |
+- -lLLVMScalarOpts \ |
| 203 |
+- -lLLVMSelectionDAG \ |
| 204 |
+- -lLLVMSparcAsmParser \ |
| 205 |
+- -lLLVMSparcAsmPrinter \ |
| 206 |
+- -lLLVMSparcCodeGen \ |
| 207 |
+- -lLLVMSparcDesc \ |
| 208 |
+- -lLLVMSparcDisassembler \ |
| 209 |
+- -lLLVMSparcInfo \ |
| 210 |
+- -lLLVMSupport \ |
| 211 |
+- -lLLVMSymbolize \ |
| 212 |
+- -lLLVMSystemZAsmParser \ |
| 213 |
+- -lLLVMSystemZAsmPrinter \ |
| 214 |
+- -lLLVMSystemZCodeGen \ |
| 215 |
+- -lLLVMSystemZDesc \ |
| 216 |
+- -lLLVMSystemZDisassembler \ |
| 217 |
+- -lLLVMSystemZInfo \ |
| 218 |
+- -lLLVMTableGen \ |
| 219 |
+- -lLLVMTarget \ |
| 220 |
+- -lLLVMTransformUtils \ |
| 221 |
+- -lLLVMVectorize \ |
| 222 |
+- -lLLVMWindowsManifest \ |
| 223 |
+- -lLLVMX86AsmParser \ |
| 224 |
+- -lLLVMX86AsmPrinter \ |
| 225 |
+- -lLLVMX86CodeGen \ |
| 226 |
+- -lLLVMX86Desc \ |
| 227 |
+- -lLLVMX86Disassembler \ |
| 228 |
+- -lLLVMX86Info \ |
| 229 |
+- -lLLVMX86Utils \ |
| 230 |
+- -lLLVMXCoreAsmPrinter \ |
| 231 |
+- -lLLVMXCoreCodeGen \ |
| 232 |
+- -lLLVMXCoreDesc \ |
| 233 |
+- -lLLVMXCoreDisassembler \ |
| 234 |
+- -lLLVMXCoreInfo \ |
| 235 |
+- -lLLVMXRay |
| 236 |
+- !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--end-group |
| 237 |
+- } |
| 238 |
++ CLANG_LIBS += -llibclang -ladvapi32 -lshell32 |
| 239 |
++ else: \ |
| 240 |
++ CLANG_LIBS += -lclang |
| 241 |
+ |
| 242 |
+ !versionIsAtLeast($$CLANG_VERSION, "3.9.0") { |
| 243 |
+ log("LLVM/Clang version >= 3.9.0 required, version provided: $${CLANG_VERSION}.$$escape_expand(\\n)") |
| 244 |
+--- a/src/qdoc/qdoc.pro 2018-05-10 12:51:22.832458913 +0200 |
| 245 |
++++ b/src/qdoc/qdoc.pro 2018-05-10 12:54:27.746557021 +0200 |
| 246 |
+@@ -15,14 +15,6 @@ |
| 247 |
+ LIBS += $$CLANG_LIBS |
| 248 |
+ !contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH |
| 249 |
+ |
| 250 |
+-# Support static libclang linking on different platforms |
| 251 |
+-equals(QMAKE_HOST.os, Windows): { |
| 252 |
+- DEFINES += CINDEX_LINKAGE= |
| 253 |
+-} else { |
| 254 |
+- LIBS += -lz -ldl |
| 255 |
+- equals(QMAKE_HOST.os, Darwin): LIBS += -lcurses -lm -lxml2 |
| 256 |
+-} |
| 257 |
+- |
| 258 |
+ !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR):!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR |
| 259 |
+ DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"$${CLANG_LIBDIR}/clang/$${CLANG_VERSION}/include\") |
| 260 |
+ |
| 261 |
|
| 262 |
diff --git a/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild b/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild |
| 263 |
index 4c656e1bf9f..2d1c8473347 100644 |
| 264 |
--- a/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild |
| 265 |
+++ b/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild |
| 266 |
@@ -24,6 +24,8 @@ QT5_TARGET_SUBDIRS=( |
| 267 |
src/qdoc |
| 268 |
) |
| 269 |
|
| 270 |
+PATCHES=( "${FILESDIR}/${PN}-5.11.0-revert-static-clang.patch" ) |
| 271 |
+ |
| 272 |
src_prepare() { |
| 273 |
qt_use_disable_mod qml qmldevtools-private \ |
| 274 |
src/qdoc/qdoc.pro |
Archives