Hello community, here is the log from the commit of package ccls for openSUSE:Factory checked in at 2019-06-21 09:58:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccls (Old) and /work/SRC/openSUSE:Factory/.ccls.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ccls" Fri Jun 21 09:58:42 2019 rev:2 rq:711210 version:0.20190314 Changes: -------- --- /work/SRC/openSUSE:Factory/ccls/ccls.changes 2019-04-11 12:17:53.372953270 +0200 +++ /work/SRC/openSUSE:Factory/.ccls.new.4811/ccls.changes 2019-06-21 09:58:42.392690775 +0200 @@ -1,0 +2,6 @@ +Thu Jun 20 15:44:08 UTC 2019 - Dan Čermák <[email protected]> + +- Add 0001-Don-t-add-include-paths-as-SYSTEM.patch + This fixes compilation failures on PPC, ARM & zSystem + +------------------------------------------------------------------- New: ---- 0001-Don-t-add-include-paths-as-SYSTEM.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccls.spec ++++++ --- /var/tmp/diff_new_pack.q6Vhi1/_old 2019-06-21 09:58:42.840691442 +0200 +++ /var/tmp/diff_new_pack.q6Vhi1/_new 2019-06-21 09:58:42.840691442 +0200 @@ -27,6 +27,9 @@ URL: https://github.com/MaskRay/ccls Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM 0001-Don-t-add-include-paths-as-SYSTEM.patch +# This fixes compilation failures on PowerPC, ARM & zSystem with gcc9 +Patch0: 0001-Don-t-add-include-paths-as-SYSTEM.patch BuildRequires: clang-devel >= 5.0 BuildRequires: cmake >= 3.8 @@ -35,6 +38,8 @@ BuildRequires: rapidjson-devel BuildRequires: zlib-devel +BuildRequires: memory-constraints + Requires: clang >= 5.0 Requires: llvm >= 7.0 @@ -67,7 +72,9 @@ pushd . %cmake -%make_build +# ccls currently consumes ~1GB of memory during compilation per thread +%limit_build -m 1500 +make %{?_smp_mflags} popd %install ++++++ 0001-Don-t-add-include-paths-as-SYSTEM.patch ++++++ >From 091d90533ba291b394feba6f7e770274cd32e738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Thu, 20 Jun 2019 17:33:16 +0200 Subject: [PATCH] Don't add include paths as SYSTEM This causes compilation failures with gcc 9 on openSUSE PowerPC, ARM and SystemZ --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index efca2ba9..e1e15c25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,7 @@ set_property(SOURCE src/utils.cc APPEND PROPERTY COMPILE_DEFINITIONS ### Includes target_include_directories(ccls PRIVATE src) -target_include_directories(ccls SYSTEM PRIVATE +target_include_directories(ccls PRIVATE third_party ${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS}) if(USE_SYSTEM_RAPIDJSON) @@ -153,7 +153,7 @@ endif() if(NOT RapidJSON_FOUND) set(RapidJSON_INCLUDE_DIRS third_party/rapidjson/include) endif() -target_include_directories(ccls SYSTEM PRIVATE ${RapidJSON_INCLUDE_DIRS}) +target_include_directories(ccls PRIVATE ${RapidJSON_INCLUDE_DIRS}) ### Install -- 2.21.0
