Hello community, here is the log from the commit of package bcc for openSUSE:Factory checked in at 2019-11-01 15:13:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bcc (Old) and /work/SRC/openSUSE:Factory/.bcc.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bcc" Fri Nov 1 15:13:54 2019 rev:31 rq:744602 version:0.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bcc/bcc.changes 2019-10-17 12:23:07.703045983 +0200 +++ /work/SRC/openSUSE:Factory/.bcc.new.2990/bcc.changes 2019-11-01 15:13:56.548739753 +0100 @@ -1,0 +2,6 @@ +Thu Oct 31 14:39:21 UTC 2019 - Ismail Dönmez <idon...@suse.com> + +- Add support-clang9.patch and apply it for llvm >= 9 +- Fix sed call for python + +------------------------------------------------------------------- New: ---- support-clang9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bcc.spec ++++++ --- /var/tmp/diff_new_pack.AF4nUn/_old 2019-11-01 15:13:57.336740781 +0100 +++ /var/tmp/diff_new_pack.AF4nUn/_new 2019-11-01 15:13:57.340740786 +0100 @@ -37,6 +37,7 @@ Url: https://github.com/iovisor/bcc Source: https://github.com/iovisor/bcc/archive/v%{version}.tar.gz Source1: https://github.com/libbpf/libbpf/archive/v%{libbpf_version}.tar.gz +Patch1: support-clang9.patch ExcludeArch: ppc s390 BuildRequires: bison BuildRequires: cmake >= 2.8.7 @@ -147,7 +148,11 @@ Documentation on how to write programs with the BPF Compiler Collection. %prep -%setup -D -n %{name}-%{version} +%setup -q -D -n %{name}-%{version} +%if %{pkg_vcmp llvm-devel >= 9.0} +%patch1 -p1 +%endif + pushd src/cc/libbpf tar xf %{SOURCE1} --strip 1 popd @@ -195,7 +200,7 @@ find tools/ examples/ -type f -exec \ sed -Ei '1s|^#!/usr/bin/env bcc-lua|#!/usr/bin/bcc-lua|' {} + find tools/ examples/ -type f -exec \ - sed -Ei 's|"python"|"python3"|g' {} + + sed -i '1s|/bin/python|/bin/python3|g' {} + %install pushd build ++++++ support-clang9.patch ++++++ Index: bcc-0.11.0/CMakeLists.txt =================================================================== --- bcc-0.11.0.orig/CMakeLists.txt +++ bcc-0.11.0/CMakeLists.txt @@ -42,20 +42,8 @@ find_package(LibElf REQUIRED) # clang is linked as a library, but the library path searching is # primitively supported, unlike libLLVM set(CLANG_SEARCH "/opt/local/llvm/lib;/usr/lib/llvm-3.7/lib;${LLVM_LIBRARY_DIRS}") -find_library(libclangAnalysis NAMES clangAnalysis HINTS ${CLANG_SEARCH}) -find_library(libclangAST NAMES clangAST HINTS ${CLANG_SEARCH}) -find_library(libclangBasic NAMES clangBasic HINTS ${CLANG_SEARCH}) -find_library(libclangCodeGen NAMES clangCodeGen HINTS ${CLANG_SEARCH}) -find_library(libclangDriver NAMES clangDriver HINTS ${CLANG_SEARCH}) -find_library(libclangEdit NAMES clangEdit HINTS ${CLANG_SEARCH}) -find_library(libclangFrontend NAMES clangFrontend HINTS ${CLANG_SEARCH}) -find_library(libclangLex NAMES clangLex HINTS ${CLANG_SEARCH}) -find_library(libclangParse NAMES clangParse HINTS ${CLANG_SEARCH}) -find_library(libclangRewrite NAMES clangRewrite HINTS ${CLANG_SEARCH}) -find_library(libclangSema NAMES clangSema HINTS ${CLANG_SEARCH}) -find_library(libclangSerialization NAMES clangSerialization HINTS ${CLANG_SEARCH}) -find_library(libclangASTMatchers NAMES clangASTMatchers HINTS ${CLANG_SEARCH}) -if(libclangBasic STREQUAL "libclangBasic-NOTFOUND") +find_library(libclang-cpp NAMES clang-cpp HINTS ${CLANG_SEARCH}) +if(libclang-cpp STREQUAL "libclang-cpp-NOTFOUND") message(FATAL_ERROR "Unable to find clang libraries") endif() FOREACH(DIR ${LLVM_INCLUDE_DIRS}) Index: bcc-0.11.0/cmake/clang_libs.cmake =================================================================== --- bcc-0.11.0.orig/cmake/clang_libs.cmake +++ bcc-0.11.0/cmake/clang_libs.cmake @@ -23,25 +23,7 @@ llvm_expand_dependencies(llvm_libs ${_ll endif() # order is important -set(clang_libs - ${libclangFrontend} - ${libclangSerialization} - ${libclangDriver}) - -if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 8 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 8) - list(APPEND clang_libs ${libclangASTMatchers}) -endif() - -list(APPEND clang_libs - ${libclangParse} - ${libclangSema} - ${libclangCodeGen} - ${libclangAnalysis} - ${libclangRewrite} - ${libclangEdit} - ${libclangAST} - ${libclangLex} - ${libclangBasic}) +set(clang_libs ${libclang-cpp}) # prune unused llvm static library stuff when linking into the new .so set(_exclude_flags)
