Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ccls/files/
Date: Wed, 27 Jan 2021 18:17:30
Message-Id: 1611771438.f397527e0d226704d2dc179fdc92d16d33b12bb7.conikost@gentoo
1 commit: f397527e0d226704d2dc179fdc92d16d33b12bb7
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jan 27 12:51:13 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 27 18:17:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f397527e
7
8 dev-util/ccls: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/19234
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 ...23.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch | 57 ----------------------
16 1 file changed, 57 deletions(-)
17
18 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
19 deleted file mode 100644
20 index e625ba814d8..00000000000
21 --- a/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
22 +++ /dev/null
23 @@ -1,57 +0,0 @@
24 -From 7e795e9b9ec20f02cab23e63d1e52189aa33ab4e Mon Sep 17 00:00:00 2001
25 -From: Fangrui Song <i@×××××××.me>
26 -Date: Fri, 1 Nov 2019 10:36:38 -0700
27 -Subject: [PATCH] cmake: support CLANG_LINK_CLANG_DYLIB
28 -
29 ----
30 - CMakeLists.txt | 34 +++++++++++++++++++---------------
31 - 1 file changed, 19 insertions(+), 15 deletions(-)
32 -
33 -diff --git a/CMakeLists.txt b/CMakeLists.txt
34 -index 278e0735..092f178f 100644
35 ---- a/CMakeLists.txt
36 -+++ b/CMakeLists.txt
37 -@@ -70,21 +70,25 @@ endif()
38 -
39 - find_package(Clang REQUIRED)
40 -
41 --target_link_libraries(ccls PRIVATE
42 -- clangIndex
43 -- clangFormat
44 -- clangTooling
45 -- clangToolingInclusions
46 -- clangToolingCore
47 -- clangFrontend
48 -- clangParse
49 -- clangSerialization
50 -- clangSema
51 -- clangAST
52 -- clangLex
53 -- clangDriver
54 -- clangBasic
55 --)
56 -+if(CLANG_LINK_CLANG_DYLIB)
57 -+ target_link_libraries(ccls PRIVATE clang-cpp)
58 -+else()
59 -+ target_link_libraries(ccls PRIVATE
60 -+ clangIndex
61 -+ clangFormat
62 -+ clangTooling
63 -+ clangToolingInclusions
64 -+ clangToolingCore
65 -+ clangFrontend
66 -+ clangParse
67 -+ clangSerialization
68 -+ clangSema
69 -+ clangAST
70 -+ clangLex
71 -+ clangDriver
72 -+ clangBasic
73 -+ )
74 -+endif()
75 -
76 - if(LLVM_LINK_LLVM_DYLIB)
77 - target_link_libraries(ccls PRIVATE LLVM)
78 ---
79 -2.26.2
80 -