Rebase to latest upstream version

- Resolves #1826281

Signed-off-by: Rafael dos Santos <rdossant@redhat.com>
This commit is contained in:
Rafael dos Santos 2020-05-07 11:31:52 +02:00
parent 4c8c8b7885
commit 4e6ce6fc67
3 changed files with 5 additions and 76 deletions

View File

@ -1,72 +0,0 @@
From 344a0966e89508ae80a69b6936c455ea726b7b3c Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 12 Dec 2019 22:59:29 +0000
Subject: [PATCH] Link against libclang-cpp.so
---
CMakeLists.txt | 16 ++--------------
cmake/clang_libs.cmake | 21 +--------------------
2 files changed, 3 insertions(+), 34 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2b72665..71b7d50e 100644
--- a/CMakeLists.txt
+++ b/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})
diff --git a/cmake/clang_libs.cmake b/cmake/clang_libs.cmake
index 5ebfaa54..321ba722 100644
--- a/cmake/clang_libs.cmake
+++ b/cmake/clang_libs.cmake
@@ -22,26 +22,7 @@ llvm_map_components_to_libnames(_llvm_libs ${llvm_raw_libs})
llvm_expand_dependencies(llvm_libs ${_llvm_libs})
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)
--
2.20.1

View File

@ -8,7 +8,7 @@
%bcond_without llvm_static
Name: bcc
Version: 0.13.0
Version: 0.14.0
Release: 1%{?dist}
Summary: BPF Compiler Collection (BCC)
License: ASL 2.0
@ -17,8 +17,6 @@ URL: https://github.com/iovisor/bcc
Source0: %{url}/releases/download/v%{version}/%{name}-src-with-submodule.tar.gz
#Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-Link-against-libclang-cpp.so.patch
# Arches will be included as upstream support is added and dependencies are
# satisfied in the respective arches
ExclusiveArch: x86_64 %{power64} aarch64 s390x
@ -181,6 +179,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/
%changelog
* Tue Apr 21 2020 Rafael dos Santos <rdossant@redhat.com> - 0.14.0-1
- Rebase to latest upstream version (#1826281)
* Wed Feb 26 2020 Rafael dos Santos <rdossant@redhat.com> - 0.13.0-1
- Rebase to latest upstream version (#1805072)

View File

@ -1 +1 @@
SHA512 (bcc-src-with-submodule.tar.gz) = 9f95f70bbebb3b5e175b2c513a51c024fdbe67283c02b81b56cdef74b1720b82df40a4555c1e1fdcfa56c64cd418abfa11b371e4111ffb3997c848f014690471
SHA512 (bcc-src-with-submodule.tar.gz) = f1093894069507ab149d452cce9c2ffe3dbb8dff14481d61031dda5e67f0b1676ea13beb6cd806fc4839dad2172efab782558b7c6d78b39979411552d6faa805