From 04740e9e1570b424c5ec3ad1636b9b10f4d441af Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Date: Tue, 4 Aug 2020 10:51:20 +0200 Subject: [PATCH] Fix cmake build - Resolves #1863243 Signed-off-by: Rafael dos Santos --- bcc.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bcc.spec b/bcc.spec index 5e2387c..a144ac9 100644 --- a/bcc.spec +++ b/bcc.spec @@ -11,9 +11,12 @@ %global with_llvm_shared 1 %endif +# Force out of source build +%undefine __cmake_in_source_build + Name: bcc Version: 0.15.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: BPF Compiler Collection (BCC) License: ASL 2.0 URL: https://github.com/iovisor/bcc @@ -116,11 +119,11 @@ Command line tools for BPF Compiler Collection (BCC) -DREVISION_LAST=%{version} -DREVISION=%{version} -DPYTHON_CMD=python3 \ -DCMAKE_USE_LIBBPF_PACKAGE:BOOL=TRUE \ %{?with_llvm_shared:-DENABLE_LLVM_SHARED=1} -%make_build +%cmake_build %install -%make_install +%cmake_install # Fix python shebangs find %{buildroot}%{_datadir}/%{name}/{tools,examples} -type f -exec \ @@ -185,6 +188,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ %changelog +* Tue Aug 04 2020 Rafael dos Santos - 0.15.0-6 +- Fix build with cmake (#1863243) + * Sat Aug 01 2020 Fedora Release Engineering - 0.15.0-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild