The package rpms/bcc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/bcc.git/commit/?id=d4390b53401549....
Change:
+ExclusiveArch: x86_64 %{power64}
Thanks.
Full change:
============
commit 0fdf98e39e46df5f8bd8d5a48b093ec21cb0a229
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Wed Nov 1 10:34:06 2017 +0100
Rebuild for LLVM5
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/bcc.spec b/bcc.spec
index 2db29eb..e26b569 100644
--- a/bcc.spec
+++ b/bcc.spec
@@ -7,7 +7,7 @@
Name: bcc
Version: 0.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: BPF Compiler Collection (BCC)
License: ASL 2.0
URL:
https://github.com/iovisor/bcc
@@ -161,6 +161,9 @@ mv %{buildroot}%{_datadir}/%{name}/examples
%{buildroot}%{_docdir}/%{name}/
%changelog
+* Wed Nov 01 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.4.0-2
+- Rebuild for LLVM5
+
* Wed Nov 01 2017 Rafael Fonseca <rdossant(a)redhat.com> - 0.4.0-1
- Resolves #1460482 - rebase to new release
- Resolves #1505506 - add support for LLVM 5.0
commit dd5e038eb7b7b739f672d02ff9503c26c0781421
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Wed Nov 1 10:33:25 2017 +0100
don't hardcode paths
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/bcc.spec b/bcc.spec
index d12c087..2db29eb 100644
--- a/bcc.spec
+++ b/bcc.spec
@@ -104,20 +104,20 @@ Command line tools for BPF Compiler Collection (BCC)
%make_install
# Fix python shebangs
-for i in `find %{buildroot}/usr/share/%{name}/tools/ -type f`; do
+for i in `find %{buildroot}%{_datadir}/%{name}/tools/ -type f`; do
sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python3}=' $i
done
-for i in `find %{buildroot}/usr/share/%{name}/examples/ -type f`; do
+for i in `find %{buildroot}%{_datadir}/%{name}/examples/ -type f`; do
sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!%{__python3}=' $i
sed -i '1s=^#!/usr/bin/env bcc-lua.*=#!/usr/bin/bcc-lua=' $i
done
# Move man pages to the right location
-mkdir -p %{buildroot}/%{_mandir}
-mv %{buildroot}/usr/share/%{name}/man/* %{buildroot}/%{_mandir}/
-mkdir -p %{buildroot}/%{_docdir}/%{name}
-mv %{buildroot}/usr/share/%{name}/examples %{buildroot}/%{_docdir}/%{name}/
+mkdir -p %{buildroot}%{_mandir}
+mv %{buildroot}%{_datadir}%{name}/man/* %{buildroot}%{_mandir}/
+mkdir -p %{buildroot}%{_docdir}/%{name}
+mv %{buildroot}%{_datadir}/%{name}/examples %{buildroot}%{_docdir}/%{name}/
# We cannot run the test suit since it requires root and it makes changes to
# the machine (e.g, IP address)
commit 8f89be512c881056389b0d71572315a51689fbc9
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Wed Nov 1 10:33:14 2017 +0100
fix typo
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/bcc.spec b/bcc.spec
index e27225a..d12c087 100644
--- a/bcc.spec
+++ b/bcc.spec
@@ -95,7 +95,7 @@ Command line tools for BPF Compiler Collection (BCC)
%build
%cmake . \
- -DCMAKE_BUILD_TYPE=RElWithDebInfo \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DREVISION_LAST=%{version} -DREVISION=%{version} -DPYTHON_CMD=python3
%make_build
commit d4390b534015496c881c536e1ef200bfc5d5b0c7
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Wed Nov 1 10:33:06 2017 +0100
use %power64 to reference ppc arches
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/bcc.spec b/bcc.spec
index 0a2becc..e27225a 100644
--- a/bcc.spec
+++ b/bcc.spec
@@ -17,7 +17,7 @@ Patch0: 0001-set-SOVERSION-for-bpf-shared.patch
# Arches will be included as upstream support is added and dependencies are
# satisfied in the respective arches
-ExclusiveArch: x86_64 ppc64 ppc64le
+ExclusiveArch: x86_64 %{power64}
BuildRequires: bison, cmake >= 2.8.7, flex, libxml2-devel
BuildRequires: python3-devel
commit 59c0211bd844f096206f406a333654c9c1eeff15
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Wed Nov 1 10:32:53 2017 +0100
use bcond for lua
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/bcc.spec b/bcc.spec
index 48d3c14..0a2becc 100644
--- a/bcc.spec
+++ b/bcc.spec
@@ -1,8 +1,8 @@
# luajit is not available for some architectures
%ifarch ppc64 ppc64le
-%{!?with_lua: %global with_lua 0}
+%bcond_with lua
%else
-%{!?with_lua: %global with_lua 1}
+%bcond_without lua
%endif
Name: bcc
@@ -24,7 +24,7 @@ BuildRequires: python3-devel
BuildRequires: elfutils-libelf-devel
BuildRequires: llvm-devel llvm-static clang-devel
BuildRequires: ncurses-devel
-%if %{with_lua}
+%if %{with lua}
BuildRequires: pkgconfig(luajit)
%endif
@@ -68,7 +68,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Python3 bindings for BPF Compiler Collection (BCC)
-%if %{with_lua}
+%if %{with lua}
%package lua
Summary: Standalone tool to run BCC tracers written in Lua
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -154,7 +154,7 @@ mv %{buildroot}/usr/share/%{name}/examples
%{buildroot}/%{_docdir}/%{name}/
%exclude %{_datadir}/%{name}/tools/old/
%{_mandir}/man8/*
-%if %{with_lua}
+%if %{with lua}
%files lua
%{_bindir}/bcc-lua
%endif