From 9d461237bbdb0cf042f76e688d1cda4882b74635 Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Tue, 4 Aug 2020 15:44:03 -0300 Subject: [PATCH] Fix FTBFS and stop stripping symbols - Fix FTBFS due to cmake wide changes #1863295 - Fix 'bpftrace symbols are stripped' #1865787 --- bpftrace.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/bpftrace.spec b/bpftrace.spec index f2172e9..722c67a 100644 --- a/bpftrace.spec +++ b/bpftrace.spec @@ -1,6 +1,6 @@ Name: bpftrace Version: 0.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-level tracing language for Linux eBPF License: ASL 2.0 @@ -45,11 +45,17 @@ and predecessor tracers such as DTrace and SystemTap -DBUILD_TESTING:BOOL=OFF \ -DBUILD_SHARED_LIBS:BOOL=OFF \ -DLIBBCC_LIBRARIES:PATH=/usr/lib64/libbcc-no-libbpf.so -%make_build +%cmake_build %install -%make_install +# The post hooks strip the binary which removes +# the BEGIN_trigger and END_trigger functions +# which are needed for the BEGIN and END probes +%global __os_install_post %{nil} +%global _find_debuginfo_opts -g + +%cmake_install # Fix shebangs (https://fedoraproject.org/wiki/Packaging:Guidelines#Shebang_lines) find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \ @@ -70,6 +76,10 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \ %changelog +* Tue Aug 04 2020 Augusto Caringi - 0.11.0-4 +- Fix FTBFS due to cmake wide changes #1863295 +- Fix 'bpftrace symbols are stripped' #1865787 + * Sat Aug 01 2020 Fedora Release Engineering - 0.11.0-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild