1 |
commit: f1c92c1d6530aeb22382ab74c9a2113da5617024 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 19 13:53:34 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 19 13:53:45 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c92c1d |
7 |
|
8 |
dev-util/clazy: Drop 1.9 |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-util/clazy/Manifest | 1 - |
14 |
dev-util/clazy/clazy-1.9.ebuild | 40 ------------- |
15 |
dev-util/clazy/files/clazy-1.9-llvm12.patch | 88 ----------------------------- |
16 |
dev-util/clazy/files/clazy-1.9-llvm13.patch | 31 ---------- |
17 |
4 files changed, 160 deletions(-) |
18 |
|
19 |
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest |
20 |
index 1a0031b71ddc..eae6b70fd4c9 100644 |
21 |
--- a/dev-util/clazy/Manifest |
22 |
+++ b/dev-util/clazy/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
DIST clazy-1.10.tar.xz 398920 BLAKE2B 1cdc160de21363c7dc9c93ea7e780412a4971b18e97c7ec6e06f1c7450c56e0fbbdb7592d6b92ae53e4c161f6d9abca205984f83b68646f04ea11d63e3c45fa6 SHA512 59dd8c6903bcc239dfc356804cab265597a771de3858a6add4877149e0e7875b3c9ddae9aeec889c9102fb9ec6b0125bb8a786344e47872b01ba87425ba021eb |
25 |
-DIST clazy-1.9.tar.xz 394856 BLAKE2B 641ca46a31475cf7bd03ba921e390cb2712362dc97b960a519e05c47049927f805d3ef6f1c756b96d3483e8f4b75e2dc41a2419a462ed2e45cbd08c88c07f933 SHA512 2e8bec44a027366263de23c50d14192e310fd38fa2b369afb21413da9cb78da9882b2153daf1784c4c9076cc62e2867b5211c75ff9a1eabcb583e405f20f5912 |
26 |
|
27 |
diff --git a/dev-util/clazy/clazy-1.9.ebuild b/dev-util/clazy/clazy-1.9.ebuild |
28 |
deleted file mode 100644 |
29 |
index 781b51040559..000000000000 |
30 |
--- a/dev-util/clazy/clazy-1.9.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,40 +0,0 @@ |
33 |
-# Copyright 1999-2021 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-inherit cmake |
39 |
- |
40 |
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics" |
41 |
-HOMEPAGE="https://apps.kde.org/en/clazy" |
42 |
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" |
43 |
- |
44 |
-LICENSE="LGPL-2+" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64 arm64 x86" |
47 |
-IUSE="" |
48 |
- |
49 |
-RDEPEND=" |
50 |
- >=sys-devel/clang-5.0:= |
51 |
- >=sys-devel/llvm-5.0:= |
52 |
-" |
53 |
-DEPEND="${RDEPEND}" |
54 |
- |
55 |
-PATCHES=( "${FILESDIR}"/${P}-llvm{12,13}.patch ) # bug 786525 |
56 |
- |
57 |
-src_prepare() { |
58 |
- cmake_src_prepare |
59 |
- |
60 |
- sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \ |
61 |
- -i CMakeLists.txt || die |
62 |
-} |
63 |
- |
64 |
-src_configure() { |
65 |
- # this package requires both llvm and clang of the same version. |
66 |
- # clang pulls in the equivalent llvm version, but not vice versa. |
67 |
- # so, we must find llvm based on the installed clang version. |
68 |
- # bug #681568 |
69 |
- local clang_version=$(best_version "sys-devel/clang") |
70 |
- export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})" |
71 |
- cmake_src_configure |
72 |
-} |
73 |
|
74 |
diff --git a/dev-util/clazy/files/clazy-1.9-llvm12.patch b/dev-util/clazy/files/clazy-1.9-llvm12.patch |
75 |
deleted file mode 100644 |
76 |
index 3862f40ad981..000000000000 |
77 |
--- a/dev-util/clazy/files/clazy-1.9-llvm12.patch |
78 |
+++ /dev/null |
79 |
@@ -1,88 +0,0 @@ |
80 |
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001 |
81 |
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@××××××××.de> |
82 |
-Date: Sat, 23 Jan 2021 15:34:10 +0100 |
83 |
-Subject: [PATCH] Fix build with Clang 12 |
84 |
- |
85 |
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812 |
86 |
---- |
87 |
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++ |
88 |
- src/SuppressionManager.cpp | 5 ++--- |
89 |
- 2 files changed, 28 insertions(+), 3 deletions(-) |
90 |
- |
91 |
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h |
92 |
-index 4db141ab..1737d5a5 100644 |
93 |
---- a/src/SourceCompatibilityHelpers.h |
94 |
-+++ b/src/SourceCompatibilityHelpers.h |
95 |
-@@ -29,6 +29,7 @@ |
96 |
- #include <clang/Basic/SourceLocation.h> |
97 |
- #include <clang/Basic/SourceManager.h> |
98 |
- #include <clang/Frontend/FrontendDiagnostic.h> |
99 |
-+#include <clang/Lex/Lexer.h> |
100 |
- #include <clang/Tooling/Core/Diagnostic.h> |
101 |
- |
102 |
- #if defined(CLAZY_USES_BOOST_REGEX) |
103 |
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d |
104 |
- #endif |
105 |
- } |
106 |
- |
107 |
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid) |
108 |
-+{ |
109 |
-+#if LLVM_VERSION_MAJOR >= 12 |
110 |
-+ auto buffer = sm.getBufferOrNone(id); |
111 |
-+ *invalid = !buffer.hasValue(); |
112 |
-+ return buffer; |
113 |
-+#else |
114 |
-+ return sm.getBuffer(id, invalid); |
115 |
-+#endif |
116 |
-+} |
117 |
-+ |
118 |
-+#if LLVM_VERSION_MAJOR >= 12 |
119 |
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile, |
120 |
-+ const clang::SourceManager &sm, const clang::LangOptions &lo) |
121 |
-+{ |
122 |
-+ return clang::Lexer(id, inputFile.getValue(), sm, lo); |
123 |
-+} |
124 |
-+#else |
125 |
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile, |
126 |
-+ const clang::SourceManager &sm, const clang::LangOptions &lo) |
127 |
-+{ |
128 |
-+ return clang::Lexer(id, inputFile, sm, lo); |
129 |
-+} |
130 |
-+#endif |
131 |
-+ |
132 |
- } |
133 |
- |
134 |
- #endif |
135 |
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp |
136 |
-index 9d774ea6..9881388d 100644 |
137 |
---- a/src/SuppressionManager.cpp |
138 |
-+++ b/src/SuppressionManager.cpp |
139 |
-@@ -24,7 +24,6 @@ |
140 |
- #include "clazy_stl.h" |
141 |
- |
142 |
- #include <clang/Basic/SourceManager.h> |
143 |
--#include <clang/Lex/Lexer.h> |
144 |
- #include <clang/Basic/SourceLocation.h> |
145 |
- #include <clang/Basic/TokenKinds.h> |
146 |
- #include <clang/Lex/Token.h> |
147 |
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla |
148 |
- Suppressions &suppressions = (*it).second; |
149 |
- |
150 |
- bool invalid = false; |
151 |
-- auto buffer = sm.getBuffer(id, &invalid); |
152 |
-+ auto buffer = clazy::getBuffer(sm, id, &invalid); |
153 |
- if (invalid) { |
154 |
- llvm::errs() << "SuppressionManager::parseFile: Invalid buffer "; |
155 |
- if (buffer) |
156 |
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla |
157 |
- return; |
158 |
- } |
159 |
- |
160 |
-- Lexer lexer(id, buffer, sm, lo); |
161 |
-+ auto lexer = clazy::getLexer(id, buffer, sm, lo); |
162 |
- lexer.SetCommentRetentionState(true); |
163 |
- |
164 |
- Token token; |
165 |
--- |
166 |
-GitLab |
167 |
- |
168 |
|
169 |
diff --git a/dev-util/clazy/files/clazy-1.9-llvm13.patch b/dev-util/clazy/files/clazy-1.9-llvm13.patch |
170 |
deleted file mode 100644 |
171 |
index 9bbac8f7624d..000000000000 |
172 |
--- a/dev-util/clazy/files/clazy-1.9-llvm13.patch |
173 |
+++ /dev/null |
174 |
@@ -1,31 +0,0 @@ |
175 |
-From 0bf4e428c76270f4534a0a8df3cf6912157f22ab Mon Sep 17 00:00:00 2001 |
176 |
-From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@×××××××.de> |
177 |
-Date: Sat, 17 Apr 2021 20:57:10 +0200 |
178 |
-Subject: [PATCH] Fix build with LLVM 13 |
179 |
- |
180 |
---- |
181 |
- src/ClazyStandaloneMain.cpp | 8 +++++++- |
182 |
- 1 file changed, 7 insertions(+), 1 deletion(-) |
183 |
- |
184 |
-diff --git a/src/ClazyStandaloneMain.cpp b/src/ClazyStandaloneMain.cpp |
185 |
-index 41c4fcf9..7b4cf5d3 100644 |
186 |
---- a/src/ClazyStandaloneMain.cpp |
187 |
-+++ b/src/ClazyStandaloneMain.cpp |
188 |
-@@ -158,7 +158,13 @@ llvm::IntrusiveRefCntPtr<vfs::FileSystem> getVfsFromFile(const std::string &over |
189 |
- |
190 |
- int main(int argc, const char **argv) |
191 |
- { |
192 |
-- CommonOptionsParser optionsParser(argc, argv, s_clazyCategory, cl::ZeroOrMore); |
193 |
-+ auto expectedParser = CommonOptionsParser::create(argc, argv, s_clazyCategory, cl::ZeroOrMore); |
194 |
-+ if (!expectedParser) { |
195 |
-+ llvm::errs() << expectedParser.takeError(); |
196 |
-+ return 1; |
197 |
-+ } |
198 |
-+ |
199 |
-+ auto &optionsParser = expectedParser.get(); |
200 |
- // llvm::errs() << optionsParser.getSourcePathList().size() << "\n"; |
201 |
- |
202 |
- if (s_supportedChecks.getValue()) { |
203 |
--- |
204 |
-GitLab |
205 |
- |