commit: 649e483cce1e297b115e2267540e12e978413098
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 01:29:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 01:29:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=649e483c
dev-util/ccls: add LLVM 14 patches; use llvm.eclass
Signed-off-by: Sam James <sam <AT> gentoo.org>
...{ccls-9999.ebuild => ccls-0.20210330-r1.ebuild} | 17 ++-
dev-util/ccls/ccls-9999.ebuild | 17 ++-
dev-util/ccls/files/ccls-0.20210330-llvm14.patch | 139 +++++++++++++++++++++
3 files changed, 165 insertions(+), 8 deletions(-)
diff --git a/dev-util/ccls/ccls-9999.ebuild
b/dev-util/ccls/ccls-0.20210330-r1.ebuild
similarity index 65%
copy from dev-util/ccls/ccls-9999.ebuild
copy to dev-util/ccls/ccls-0.20210330-r1.ebuild
index 377cc36c8068..f2069853b3f4 100644
--- a/dev-util/ccls/ccls-9999.ebuild
+++ b/dev-util/ccls/ccls-0.20210330-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,9 +7,12 @@ EGIT_REPO_URI="https://github.com/MaskRay/${PN}";
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
+ LLVM_MAX_SLOT=9999
+else
+ LLVM_MAX_SLOT=14
fi
-inherit cmake ${GIT_ECLASS}
+inherit cmake llvm ${GIT_ECLASS}
DESCRIPTION="C/C++/ObjC language server"
HOMEPAGE="https://github.com/MaskRay/ccls";
@@ -25,13 +28,19 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
+# We only depend on Clang because of a quirk in how dependencies work
+# See comment in llvm.eclass docs
DEPEND="
dev-libs/rapidjson
- sys-devel/clang:=
- sys-devel/llvm:=
+ <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-llvm-cmake.patch
+ "${FILESDIR}"/${P}-llvm14.patch
+)
+
src_configure() {
local mycmakeargs=(
-DCCLS_VERSION=${PV}
diff --git a/dev-util/ccls/ccls-9999.ebuild b/dev-util/ccls/ccls-9999.ebuild
index 377cc36c8068..f2069853b3f4 100644
--- a/dev-util/ccls/ccls-9999.ebuild
+++ b/dev-util/ccls/ccls-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,9 +7,12 @@ EGIT_REPO_URI="https://github.com/MaskRay/${PN}";
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
+ LLVM_MAX_SLOT=9999
+else
+ LLVM_MAX_SLOT=14
fi
-inherit cmake ${GIT_ECLASS}
+inherit cmake llvm ${GIT_ECLASS}
DESCRIPTION="C/C++/ObjC language server"
HOMEPAGE="https://github.com/MaskRay/ccls";
@@ -25,13 +28,19 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
+# We only depend on Clang because of a quirk in how dependencies work
+# See comment in llvm.eclass docs
DEPEND="
dev-libs/rapidjson
- sys-devel/clang:=
- sys-devel/llvm:=
+ <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-llvm-cmake.patch
+ "${FILESDIR}"/${P}-llvm14.patch
+)
+
src_configure() {
local mycmakeargs=(
-DCCLS_VERSION=${PV}
diff --git a/dev-util/ccls/files/ccls-0.20210330-llvm14.patch
b/dev-util/ccls/files/ccls-0.20210330-llvm14.patch
new file mode 100644
index 000000000000..79bf0f124422
--- /dev/null
+++ b/dev-util/ccls/files/ccls-0.20210330-llvm14.patch
@@ -0,0 +1,139 @@
+https://github.com/MaskRay/ccls/commit/3ce756e39ae48204f016a58684652ad62b4dd9f9.patch
+https://github.com/MaskRay/ccls/commit/8422f0a522b6fbcb4412a8ec73d80b4acbc7e00f.patch
+https://github.com/MaskRay/ccls/commit/790daca4b2d9d5873623fee86283cd61212df674.patch
+
+From: Fangrui Song <i...@maskray.me>
+Date: Thu, 23 Sep 2021 13:36:01 -0700
+Subject: [PATCH] Adaopt llvmorg-14-init-3863-g601102d282d5: refactor
+ clang::isIdentifierBody
+
+---
+ src/clang_tu.hh | 4 ++++
+ src/indexer.cc | 6 +++---
+ src/working_files.cc | 9 ++++++---
+ 3 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/src/clang_tu.hh b/src/clang_tu.hh
+index b37950926..7dbfc4a88 100644
+--- a/src/clang_tu.hh
++++ b/src/clang_tu.hh
+@@ -17,6 +17,10 @@ namespace vfs = clang::vfs;
+ }
+ #endif
+
++#if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5
++#define isAsciiIdentifierContinue isIdentifierBody
++#endif
++
+ namespace ccls {
+ std::string pathFromFileEntry(const clang::FileEntry &file);
+
+diff --git a/src/indexer.cc b/src/indexer.cc
+index 89d78959e..644c0ccbb 100644
+--- a/src/indexer.cc
++++ b/src/indexer.cc
+@@ -527,8 +527,8 @@ class IndexDataConsumer : public index::IndexDataConsumer {
+ auto i = name.find(short_name);
+ if (short_name.size())
+ while (i != std::string::npos &&
+- ((i && isIdentifierBody(name[i - 1])) ||
+- isIdentifierBody(name[i + short_name.size()])))
++ ((i && isAsciiIdentifierContinue(name[i - 1])) ||
++ isAsciiIdentifierContinue(name[i + short_name.size()])))
+ i = name.find(short_name, i + short_name.size());
+ if (i == std::string::npos) {
+ // e.g. operator type-parameter-1
+@@ -552,7 +552,7 @@ class IndexDataConsumer : public index::IndexDataConsumer {
+ paren++;
+ else if (name[i - 1] == '(')
+ paren--;
+- else if (!(paren > 0 || isIdentifierBody(name[i - 1]) ||
++ else if (!(paren > 0 || isAsciiIdentifierContinue(name[i - 1]) ||
+ name[i - 1] == ':'))
+ break;
+ }
+diff --git a/src/working_files.cc b/src/working_files.cc
+index f80f21053..4904388be 100644
+--- a/src/working_files.cc
++++ b/src/working_files.cc
+@@ -342,7 +342,10 @@ std::optional<int>
WorkingFile::getIndexPosFromBufferPos(int line, int *column,
+ Position WorkingFile::getCompletionPosition(Position pos, std::string
*filter) const {
+ int start = getOffsetForPosition(pos, buffer_content);
+ int i = start;
+- while (i > 0 && isIdentifierBody(buffer_content[i - 1]))
++#if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5
++#define isAsciiIdentifierContinue isIdentifierBody
++#endif
++ while (i > 0 && isAsciiIdentifierContinue(buffer_content[i - 1]))
+ --i;
+ *filter = buffer_content.substr(i, start - i);
+ return getPositionForOffset(buffer_content, i);
+@@ -455,10 +458,10 @@ std::string_view lexIdentifierAroundPos(Position
position,
+ c = content[start - 1];
+ if (c == ':' && start > 1 && content[start - 2] == ':')
+ start--;
+- else if (!isIdentifierBody(c))
++ else if (!isAsciiIdentifierContinue(c))
+ break;
+ }
+- for (; end < content.size() && isIdentifierBody(content[end]); end++)
++ for (; end < content.size() && isAsciiIdentifierContinue(content[end]);
end++)
+ ;
+
+ return content.substr(start, end - start);
+
+
+From: Fangrui Song <i...@maskray.me>
+Date: Sun, 9 Jan 2022 12:25:07 -0800
+Subject: [PATCH] Adapt llvmorg-14-init-13600-g92417eaf3329: braced constructor
+ call
+
+---
+ src/messages/textDocument_signatureHelp.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/messages/textDocument_signatureHelp.cc
b/src/messages/textDocument_signatureHelp.cc
+index 8e8a7277..4192272a 100644
+--- a/src/messages/textDocument_signatureHelp.cc
++++ b/src/messages/textDocument_signatureHelp.cc
+@@ -80,6 +80,10 @@ class SignatureHelpConsumer : public CodeCompleteConsumer {
+ #if LLVM_VERSION_MAJOR >= 8
+ ,
+ SourceLocation openParLoc
++#endif
++#if LLVM_VERSION_MAJOR >= 14
++ ,
++ bool braced
+ #endif
+ ) override {
+ ls_sighelp.activeParameter = (int)currentArg;
+@@ -93,7 +97,11 @@ class SignatureHelpConsumer : public CodeCompleteConsumer {
+ cand = OverloadCandidate(pattern);
+
+ const auto *ccs =
++#if LLVM_VERSION_MAJOR >= 14
++ cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true,
braced);
++#else
+ cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true);
++#endif
+
+ const char *ret_type = nullptr;
+ SignatureInformation &ls_sig = ls_sighelp.signatures.emplace_back();
+
+
+From: Fangrui Song <i...@maskray.me>
+Date: Sun, 30 Jan 2022 11:17:32 -0800
+Subject: [PATCH] query: include llvm/ADT/STLExtras.h
+
+The header is no longer transitively included in 2022-01.
+--- a/src/query.cc
++++ b/src/query.cc
+@@ -9,6 +9,8 @@
+
+ #include <rapidjson/document.h>
+
++#include <llvm/ADT/STLExtras.h>
++
+ #include <assert.h>
+ #include <functional>
+ #include <limits.h>
