diff --git a/SPECS/bcc.spec b/SPECS/bcc.spec
index 4439d73..f4c4f45 100644
--- a/SPECS/bcc.spec
+++ b/SPECS/bcc.spec
@@ -1,11 +1,15 @@
# luajit is not available RHEL 8
%bcond_with lua
-%bcond_without llvm_static
+%bcond_with llvm_static
+
+%if %{without llvm_static}
+%global with_llvm_shared 1
+%endif
Name: bcc
Version: 0.16.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: BPF Compiler Collection (BCC)
License: ASL 2.0
URL: https://github.com/iovisor/bcc
@@ -19,22 +23,25 @@ Patch1: %{name}-%{version}-tools-tcptracer-fix-alignement-in-tcp_ipv6_ev
# satisfied in the respective arches
ExcludeArch: i686
-BuildRequires: bison, cmake >= 2.8.7, flex, libxml2-devel
+BuildRequires: bison
+BuildRequires: cmake >= 2.8.7
+BuildRequires: flex
+BuildRequires: libxml2-devel
BuildRequires: python3-devel
BuildRequires: elfutils-libelf-devel
BuildRequires: llvm-devel
BuildRequires: clang-devel
-BuildRequires: ncurses-devel
-%if %{with lua}
-BuildRequires: pkgconfig(luajit)
-%endif
%if %{with llvm_static}
BuildRequires: llvm-static
%endif
-
-BuildRequires: clang
+BuildRequires: ncurses-devel
+%if %{with lua}
+BuildRequires: pkgconfig(luajit)
+%endif
+BuildRequires: libbpf-devel >= 0.0.9, libbpf-static >= 0.0.9
Requires: %{name}-tools = %{version}-%{release}
+Requires: libbpf >= 0.0.9
%description
BCC is a toolkit for creating efficient kernel tracing and manipulation
@@ -101,9 +108,12 @@ Command line tools for BPF Compiler Collection (BCC)
%build
%cmake . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DREVISION_LAST=%{version} -DREVISION=%{version} -DPYTHON_CMD=python3
+ -DREVISION_LAST=%{version} -DREVISION=%{version} -DPYTHON_CMD=python3 \
+ -DCMAKE_USE_LIBBPF_PACKAGE:BOOL=TRUE \
+ %{?with_llvm_shared:-DENABLE_LLVM_SHARED=1}
%make_build
+
%install
%make_install
@@ -147,12 +157,14 @@ done
%license LICENSE.txt
%{_libdir}/lib%{name}.so.*
%{_libdir}/libbcc_bpf.so.*
+%{_libdir}/libbcc-no-libbpf.so.*
%files devel
%exclude %{_libdir}/lib%{name}*.a
%exclude %{_libdir}/lib%{name}*.la
%{_libdir}/lib%{name}.so
%{_libdir}/libbcc_bpf.so
+%{_libdir}/libbcc-no-libbpf.so
%{_libdir}/pkgconfig/lib%{name}.pc
%{_includedir}/%{name}/
@@ -203,6 +215,10 @@ done
%changelog
+* Fri Jan 22 2021 Jerome Marchand <jmarchan@redhat.com> - 0.16.0-2
+- Build with libbpf package
+- spec file cleanups
+
* Mon Oct 26 2020 Jerome Marchand <jmarchan@redhat.com> - 0.16.0-1
- Rebase on bcc-0.16.0
- Fix IPv6 ports