[gentoo-commits] repo/gentoo:master commit in: dev-util/ccls/files/, dev-util/ccls/

[Matt Turner]

commit:     ac5b5ef0678445ba9f4dd8d3c5bf7068fe5079c9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 17:43:26 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 17:44:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac5b5ef0

dev-util/ccls: Add patch to provide clang-10 support

Closes: https://bugs.gentoo.org/719334
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/ccls/ccls-0.20190823.6.ebuild             |  4 ++
 ...23.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch | 57 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/dev-util/ccls/ccls-0.20190823.6.ebuild b/dev-util/ccls/ccls-0.20190823.6.ebuild
index ac5830184a3..791e2522eef 100644
--- a/dev-util/ccls/ccls-0.20190823.6.ebuild
+++ b/dev-util/ccls/ccls-0.20190823.6.ebuild
@@ -32,6 +32,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_SYSTEM_RAPIDJSON=ON

diff --git a/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch b/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
new file mode 100644
index 00000000000..e625ba814d8
--- /dev/null
+++ b/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
@@ -0,0 +1,57 @@
+From 7e795e9b9ec20f02cab23e63d1e52189aa33ab4e Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i@×××××××.me>
+Date: Fri, 1 Nov 2019 10:36:38 -0700
+Subject: [PATCH] cmake: support CLANG_LINK_CLANG_DYLIB
+
+---
+ CMakeLists.txt | 34 +++++++++++++++++++---------------
+ 1 file changed, 19 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 278e0735..092f178f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,21 +70,25 @@ endif()
+ 
+ find_package(Clang REQUIRED)
+ 
+-target_link_libraries(ccls PRIVATE
+-  clangIndex
+-  clangFormat
+-  clangTooling
+-  clangToolingInclusions
+-  clangToolingCore
+-  clangFrontend
+-  clangParse
+-  clangSerialization
+-  clangSema
+-  clangAST
+-  clangLex
+-  clangDriver
+-  clangBasic
+-)
++if(CLANG_LINK_CLANG_DYLIB)
++  target_link_libraries(ccls PRIVATE clang-cpp)
++else()
++  target_link_libraries(ccls PRIVATE
++    clangIndex
++    clangFormat
++    clangTooling
++    clangToolingInclusions
++    clangToolingCore
++    clangFrontend
++    clangParse
++    clangSerialization
++    clangSema
++    clangAST
++    clangLex
++    clangDriver
++    clangBasic
++  )
++endif()
+ 
+ if(LLVM_LINK_LLVM_DYLIB)
+   target_link_libraries(ccls PRIVATE LLVM)
+-- 
+2.26.2
+