Notification time stamped 2020-01-31 22:35:32 UTC
From b4bb27b3ec442180d15adf2b74bcd892ce9d3e2d Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar(a)redhat.com>
Date: Jan 31 2020 16:52:13 +0000
Subject: Link against libclang-cpp.so
https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component...
---
diff --git a/0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
b/0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
new file mode 100644
index 0000000..86eec0f
--- /dev/null
+++ b/0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
@@ -0,0 +1,57 @@
+From 73f8978dd22571b3b8868ee930378c25b86a74ba Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i(a)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.21.0
+
diff --git a/ccls.spec b/ccls.spec
index a15beb4..8680a6d 100644
--- a/ccls.spec
+++ b/ccls.spec
@@ -1,6 +1,6 @@
Name: ccls
Version: 0.20190823.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: C/C++/ObjC language server
# main package is Apache 2.0
@@ -9,6 +9,9 @@ License: ASL 2.0 and CC0 and Boost
URL:
https://github.com/MaskRay/ccls
Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz
+#
https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component...
+Patch0: 0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
+
BuildRequires: cmake >= 3.8
BuildRequires: gcc-c++ >= 7.2
BuildRequires: llvm-devel >= 7.0
@@ -46,7 +49,7 @@ rm -rf third_party/rapidjson
%build
mkdir build && pushd build
-%cmake ..
+%cmake .. -DCLANG_LINK_CLANG_DYLIB=ON
%make_build
popd
@@ -60,6 +63,10 @@ popd
%doc README.md
%changelog
+* Fri Jan 31 2020 Tom Stellard <tstellar(a)redhat.com> - 0.20190823.5-3
+- Link against libclang-cpp.so
+-
https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component...
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.20190823.5-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/ccls/c/b4bb27b3ec442180d15adf2b74bcd89...