Hello community, here is the log from the commit of package bcc for openSUSE:Factory checked in at 2018-01-20 11:27:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bcc (Old) and /work/SRC/openSUSE:Factory/.bcc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bcc" Sat Jan 20 11:27:49 2018 rev:16 rq:567626 version:0.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bcc/bcc.changes 2017-12-21 11:29:21.567502912 +0100 +++ /work/SRC/openSUSE:Factory/.bcc.new/bcc.changes 2018-01-20 11:27:50.397208880 +0100 @@ -1,0 +2,6 @@ +Fri Jan 19 09:58:59 UTC 2018 - [email protected] + +- Add bcc-fix-build-for-llvm-5.0.1.patch to fix the compilation + error against llvm-5.0.1 + +------------------------------------------------------------------- New: ---- bcc-fix-build-for-llvm-5.0.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bcc.spec ++++++ --- /var/tmp/diff_new_pack.ssBPQ0/_old 2018-01-20 11:27:51.297166791 +0100 +++ /var/tmp/diff_new_pack.ssBPQ0/_new 2018-01-20 11:27:51.301166604 +0100 @@ -1,7 +1,7 @@ # # spec file for package bcc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,7 @@ Patch1: %{name}-check_int128.patch Patch2: %{name}-bsc1065593-llvm4-hack.patch Patch3: %{name}-python3.patch +Patch4: %{name}-fix-build-for-llvm-5.0.1.patch ExcludeArch: ppc s390 BuildRequires: bison BuildRequires: cmake >= 2.8.7 @@ -159,6 +160,7 @@ %patch2 -p1 %endif %patch3 -p1 +%patch4 -p1 %build # Prevent the cpp examples from compilation and installation ++++++ bcc-fix-build-for-llvm-5.0.1.patch ++++++ >From bd7fa55bb39b8978dafd0b299e35616061e0a368 Mon Sep 17 00:00:00 2001 From: Yonghong Song <[email protected]> Date: Wed, 27 Dec 2017 22:22:43 -0800 Subject: [PATCH] fix build issue for llvm 5.0.1 Fix issue #1502. A few cmake version checking greater than 5 includes 5.0.1 which results in compilation failure. Change version checking to explicitly equal to or greater than version 6. Signed-off-by: Yonghong Song <[email protected]> --- cmake/clang_libs.cmake | 2 +- src/cc/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/clang_libs.cmake b/cmake/clang_libs.cmake index cd7f189..cf1b10f 100644 --- a/cmake/clang_libs.cmake +++ b/cmake/clang_libs.cmake @@ -8,7 +8,7 @@ list(FIND LLVM_AVAILABLE_LIBS "LLVMCoroutines" _llvm_coroutines) if (${_llvm_coroutines} GREATER -1) list(APPEND llvm_raw_libs coroutines) endif() -if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "5") +if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6) list(APPEND llvm_raw_libs bpfasmparser) list(APPEND llvm_raw_libs bpfdisassembler) endif() diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt index 1a52782..3f6855c 100644 --- a/src/cc/CMakeLists.txt +++ b/src/cc/CMakeLists.txt @@ -29,7 +29,7 @@ set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0 set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bpf) set(bcc_common_sources bpf_common.cc bpf_module.cc exported_files.cc) -if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "5") +if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6) set(bcc_common_sources ${bcc_common_sources} bcc_debug.cc) endif() -- 2.15.1
