diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
| commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
| tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /dev-util/ccls | |
| parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) | |
gentoo resync : 14.05.2020
Diffstat (limited to 'dev-util/ccls')
| -rw-r--r-- | dev-util/ccls/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/ccls/ccls-0.20190823.6.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch | 57 |
3 files changed, 63 insertions, 1 deletions
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest index 422a282fae87..cf463e682d82 100644 --- a/dev-util/ccls/Manifest +++ b/dev-util/ccls/Manifest @@ -1,6 +1,7 @@ +AUX ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch 1197 BLAKE2B c15211d1c4a63c9c75aef0cd4cf1a545a6b9a81e48fce9363e20483a7cb8d28bfa2ef978c127c324b2e089eb78bea214bdd7277e75a1a099ea03deb6571c5023 SHA512 c2ea4edd9ba56262e8122c8e0da11210f0c2ca6bfe6f404b0d0e745d5927dacdb1ad11824b5c78e8ea326365b50f55d9a229b3c6055c8b529cea9d6c4fc5fa9f DIST ccls-0.20190823.5.tar.gz 158118 BLAKE2B 09b4a985a284fe74adc408eb9e86094aaf4ebfaf50de3238a17299efabe4749326b8239356c2808ca500a44bef664b2a654e9b16c83c3ef04cd7cf90c56fe3ef SHA512 3c4ecac663eb463870153734fa6206701ede9d72bae3b6eae9c26adab2979ad79d2ac860c1ffb07f8cfcea4aa63afed90510734d91f830c99a86b3811959583f DIST ccls-0.20190823.6.tar.gz 158158 BLAKE2B f2957b310f1bddc17a498191d315327adbeed72ecf3a60f2abde2fe1af8341246670d779807dcfaf98217f648d4fbe5914e4f64108cfe7a3f68e62b00e96dcaa SHA512 c6df96e304f5b7381c67eda4c1bd05873a85fb0d0983b3abcc507987a402860aa6660079a0e7b125f5cda22047da936239480aa0b604cd2598f84a4b9e9c3bdd EBUILD ccls-0.20190823.5.ebuild 698 BLAKE2B fe14be8fc89c8cbafc63848c833b95e78488c270371d7e82816f798375d77e4b4f4099d3f811e34ca9fa8b607958336e8c613d04afba10b9f59cda9730eccc16 SHA512 f8aee0dd366fbf705e445df84882b516dc6abd09267cdb189745f0f7c7127abd3a92d0a403c81f02b3d5eaa59601f514ba8f98cba274947c5620d9db8177d1be -EBUILD ccls-0.20190823.6.ebuild 727 BLAKE2B b5259dba8a7f535857c185da4bb53004ca3eabd8295ab4fc3f0b9843cb21abcfe31ef5db7436405811436bdb80698d75368d64c1a6f14d6a97bcb1bd8c11c5d9 SHA512 bd20ed44f154d1f0e2d7d11a7560c47a849ce8d47bf18662368526655f56e539cab795326617d83d58a25e5f634b8b874da6d06133514f18d664f9d4c16f715c +EBUILD ccls-0.20190823.6.ebuild 803 BLAKE2B 9e6bea6e9dca2320d3bd808aef146d2fde415c332557ef9f5a5aff8315805ab3cf62bde6f72c6dfb8d389d778f036882df66caeabfa0ecd7178c342895a7fd86 SHA512 a4435fbd148b5e35b61e51502a5705444c24ccaabd50e57a2cd0fa3fcdfa579f18afa78819a67e55e7332a09ce6287d7e9702b48ecb0cc8f69d7168f50cafd80 EBUILD ccls-9999.ebuild 727 BLAKE2B b5259dba8a7f535857c185da4bb53004ca3eabd8295ab4fc3f0b9843cb21abcfe31ef5db7436405811436bdb80698d75368d64c1a6f14d6a97bcb1bd8c11c5d9 SHA512 bd20ed44f154d1f0e2d7d11a7560c47a849ce8d47bf18662368526655f56e539cab795326617d83d58a25e5f634b8b874da6d06133514f18d664f9d4c16f715c MISC metadata.xml 323 BLAKE2B 0a85191d1996e2f30d149c30bb73ffc49f95600b8a08f5a8ee4a6aede0671d0b14f2de04173e4bb1ba0b9f6e09e79316d1f7de33b490d3ce815b8ab7b29f5f91 SHA512 da5bf276e9237df06298b14f68be2f57ef5ace58aea180623bc896a2f05dd5e6809b0409ac3ffba0e2c26d854b7d3b47f8e47caec0082e9397f5dc4037f549ad diff --git a/dev-util/ccls/ccls-0.20190823.6.ebuild b/dev-util/ccls/ccls-0.20190823.6.ebuild index ac5830184a31..791e2522eef7 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 000000000000..e625ba814d8e --- /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@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 + |