Hello community, here is the log from the commit of package ccls for openSUSE:Factory checked in at 2020-04-14 15:11:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccls (Old) and /work/SRC/openSUSE:Factory/.ccls.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ccls" Tue Apr 14 15:11:33 2020 rev:9 rq:793776 version:0.20190823.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ccls/ccls.changes 2019-11-07 23:16:28.176531037 +0100 +++ /work/SRC/openSUSE:Factory/.ccls.new.2738/ccls.changes 2020-04-14 16:17:14.623379869 +0200 @@ -1,0 +2,16 @@ +Tue Apr 14 08:34:23 UTC 2020 - Dan Čermák <[email protected]> + +- Fix build failures with LLVM 10 + + Added: + * 0002-Adapt-llvmorg-10-init-12036-g3b9715cb2193-handleDecl.patch + + Rebased: + * 0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch + +------------------------------------------------------------------- +Mon Jan 20 09:27:29 UTC 2020 - Dan Čermák <[email protected]> + +- Enable building on Leap 15.2 + +------------------------------------------------------------------- New: ---- 0002-Adapt-llvmorg-10-init-12036-g3b9715cb2193-handleDecl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccls.spec ++++++ --- /var/tmp/diff_new_pack.yWgU8N/_old 2020-04-14 16:17:15.167380258 +0200 +++ /var/tmp/diff_new_pack.yWgU8N/_new 2020-04-14 16:17:15.171380261 +0200 @@ -1,7 +1,7 @@ # # spec file for package ccls # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,27 +24,32 @@ # bundled dependencies are Boost (macro_map) and CC0 (siphash) License: Apache-2.0 AND CC0-1.0 AND BSL-1.0 Group: Development/Tools/IDE - URL: https://github.com/MaskRay/ccls Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz -# FIXME: drop this patch on the next release after 0.20190823.4 +# FIXME: drop this patch on the next release after 0.20190823.5 # cherry picked from: https://github.com/MaskRay/ccls/pull/519 Patch0: 0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch - +# fix build with llvm 10 +Patch1: 0002-Adapt-llvmorg-10-init-12036-g3b9715cb2193-handleDecl.patch BuildRequires: clang-devel >= 7.0 BuildRequires: cmake >= 3.8 -BuildRequires: gcc-c++ >= 7.2 BuildRequires: llvm-devel >= 7.0 +BuildRequires: memory-constraints BuildRequires: rapidjson-devel BuildRequires: zlib-devel - -BuildRequires: memory-constraints - Requires: clang >= 5.0 Requires: llvm >= 7.0 - Provides: bundled(macro_map) Provides: bundled(siphash) +# ccls hardcodes the paths to clang's resource dir and we thus must ensure that +# it is always shipped with the same clang version that was used to build it +%{requires_eq clang} +# gcc > 7.0 is called gcc7- in Leap 15.2 +%if 0%{?sle_version} == 150200 +BuildRequires: gcc7-c++ >= 7.2 +%else +BuildRequires: gcc-c++ >= 7.2 +%endif %description ccls, which originates from cquery, is a C/C++/Objective-C language server. @@ -63,9 +68,11 @@ - semantic highlighting and preprocessor skipped regions - semantic navigation: $ccls/navigate - %prep -%autosetup +%setup -q +%if 0%{?sle_version} != 150200 +%autopatch -p1 +%endif rm -rf third_party/rapidjson %build ++++++ 0001-cmake-support-CLANG_LINK_CLANG_DYLIB.patch ++++++ --- /var/tmp/diff_new_pack.yWgU8N/_old 2020-04-14 16:17:15.187380273 +0200 +++ /var/tmp/diff_new_pack.yWgU8N/_new 2020-04-14 16:17:15.187380273 +0200 @@ -1,8 +1,9 @@ -From 396d0668affe28af401b50fe8a76f4e114efc40b Mon Sep 17 00:00:00 2001 +From b9f6d837bb340428eb200ac156d029bb7dc7cd76 Mon Sep 17 00:00:00 2001 From: Fangrui Song <[email protected]> Date: Fri, 1 Nov 2019 10:36:38 -0700 -Subject: [PATCH] cmake: support CLANG_LINK_CLANG_DYLIB +Subject: [PATCH 1/2] cmake: support CLANG_LINK_CLANG_DYLIB +(cherry picked from commit a7a982ab9232b2730280439781f83f8055363c59) --- CMakeLists.txt | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) @@ -53,5 +54,5 @@ if(LLVM_LINK_LLVM_DYLIB) target_link_libraries(ccls PRIVATE LLVM) -- -2.23.0 +2.26.0 ++++++ 0002-Adapt-llvmorg-10-init-12036-g3b9715cb2193-handleDecl.patch ++++++ >From 768ec33e9ee560580c85e367c8abca31de7d7198 Mon Sep 17 00:00:00 2001 From: Fangrui Song <[email protected]> Date: Mon, 16 Dec 2019 22:11:31 -0800 Subject: [PATCH 2/2] Adapt llvmorg-10-init-12036-g3b9715cb2193: handleDeclOccurence -> handleDeclOccurrence (cherry picked from commit 86e340caf00b2d337ddb839e646085bf2222be3b) --- src/indexer.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/indexer.cc b/src/indexer.cc index 0459103f..33481161 100644 --- a/src/indexer.cc +++ b/src/indexer.cc @@ -677,10 +677,13 @@ public: public: IndexDataConsumer(IndexParam ¶m) : param(param) {} void initialize(ASTContext &ctx) override { this->ctx = param.ctx = &ctx; } - bool handleDeclOccurence(const Decl *d, index::SymbolRoleSet roles, - ArrayRef<index::SymbolRelation> relations, - SourceLocation src_loc, - ASTNodeInfo ast_node) override { +#if LLVM_VERSION_MAJOR < 10 // llvmorg-10-init-12036-g3b9715cb219 +# define handleDeclOccurrence handleDeclOccurence +#endif + bool handleDeclOccurrence(const Decl *d, index::SymbolRoleSet roles, + ArrayRef<index::SymbolRelation> relations, + SourceLocation src_loc, + ASTNodeInfo ast_node) override { if (!param.no_linkage) { if (auto *nd = dyn_cast<NamedDecl>(d); nd && nd->hasLinkage()) ; -- 2.26.0
