From 348504d19c01a7b588e4dc7cf5d4af88654734c7 Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: May 10 2021 21:42:22 +0000 Subject: perf: enable dynamic linking of libbpf Signed-off-by: Justin M. Forbes --- diff --git a/kernel-tools.spec b/kernel-tools.spec index 522f465..39e687b 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -73,6 +73,7 @@ BuildRequires: zlib-devel binutils-devel newt-devel python3-docutils perl(ExtUti BuildRequires: audit-libs-devel glibc-devel glibc-headers glibc-static python3-devel java-devel BuildRequires: asciidoc xmlto libcap-devel BuildRequires: opencsd-devel openssl-devel libbabeltrace-devel +BuildRequires: libbpf-devel # Used to mangle unversioned shebangs to be Python 3 BuildRequires: /usr/bin/pathfix.py %ifnarch s390x %{arm} @@ -225,7 +226,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" tools/ tools/perf/scripts/pyth cd linux-%{kversion} %global perf_make \ - make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 CORESIGHT=1 prefix=%{_prefix} + make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 CORESIGHT=1 prefix=%{_prefix} %global perf_python3 -C tools/perf PYTHON=%{__python3} # perf # make sure check-headers.sh is executable @@ -484,6 +485,9 @@ popd %license linux-%{kversion}/COPYING %changelog +* Mon May 10 2021 Justin M. Forbes +- perf: enable dynamic linking of libbpf + * Mon May 10 2021 Justin M. Forbes - 5.13.0-0.rc1.git0.1 - Linux v5.13-rc1