Hello community, here is the log from the commit of package ccls for openSUSE:Factory checked in at 2019-11-07 23:16:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccls (Old) and /work/SRC/openSUSE:Factory/.ccls.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ccls" Thu Nov 7 23:16:19 2019 rev:8 rq:745560 version:0.20190823.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ccls/ccls.changes 2019-11-01 15:14:10.592758069 +0100 +++ /work/SRC/openSUSE:Factory/.ccls.new.2990/ccls.changes 2019-11-07 23:16:28.176531037 +0100 @@ -1,0 +2,9 @@ +Tue Nov 5 20:24:48 UTC 2019 - Dan Čermák <dcer...@suse.com> + +- Switch from custom patch to upstream fix: + Drop 0001-Fix-builds-for-LLVM-9-for-LLVM-build-without-BUILD_S.patch + (rejected upstream) + Add 0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch + (upstream fix: https://github.com/MaskRay/ccls/pull/519) + +------------------------------------------------------------------- Old: ---- 0001-Fix-builds-for-LLVM-9-for-LLVM-build-without-BUILD_S.patch New: ---- 0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccls.spec ++++++ --- /var/tmp/diff_new_pack.yHwEW0/_old 2019-11-07 23:16:28.820531743 +0100 +++ /var/tmp/diff_new_pack.yHwEW0/_new 2019-11-07 23:16:28.824531747 +0100 @@ -27,9 +27,9 @@ URL: https://github.com/MaskRay/ccls Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz -# FIXME: drop this patch on the next release after -# https://github.com/MaskRay/ccls/pull/518 gets merged -Patch0: 0001-Fix-builds-for-LLVM-9-for-LLVM-build-without-BUILD_S.patch +# FIXME: drop this patch on the next release after 0.20190823.4 +# cherry picked from: https://github.com/MaskRay/ccls/pull/519 +Patch0: 0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch BuildRequires: clang-devel >= 7.0 BuildRequires: cmake >= 3.8 @@ -70,7 +70,7 @@ %build pushd . -%cmake -DUSE_SYSTEM_RAPIDJSON=ON +%cmake -DUSE_SYSTEM_RAPIDJSON=ON -DCLANG_LINK_CLANG_DYLIB=on # ccls currently consumes ~1GB of memory during compilation per thread %limit_build -m 1500 ++++++ 0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch ++++++ >From 396d0668affe28af401b50fe8a76f4e114efc40b 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.23.0
