gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Closes: https://bugs.gentoo.org/719334
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner
2020-04-29 10:43:26 -07:00
parent 7dc065d954
commit ac5b5ef067
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-util/ccls/ccls-0.20190823.6.ebuild
View File

@@ -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

57
dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch Normal file
View File

@@ -0,0 +1,57 @@
From 7e795e9b9ec20f02cab23e63d1e52189aa33ab4e Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.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