From 3f15f9038bdd390b92c9675ab8c5443551b85e70 Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Fri, 27 Nov 2020 01:21:49 +0300
Subject: [PATCH] Fix building perf on aarch64

---
 kernel.spec | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index 74509e0..9418732 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -24,7 +24,7 @@
 %define sublevel	80
 
 # Release number. Increase this before a rebuild.
-%define rpmrel		1
+%define rpmrel		2
 %define fullrpmrel	%{rpmrel}
 
 %define rpmtag		%{disttag}
@@ -40,13 +40,12 @@
 %define kverrel   	%{kversion}-%{fullrpmrel}
 %define tar_ver   	%{kernelversion}.%{patchlevel}
 
-# i586
 %ifarch %{ix86}
 %define arch_suffix	i686
 %endif
 
 %ifarch %{x86_64}
-%define arch_suffix	%{_arch}
+%define arch_suffix	x86_64
 %endif
 
 %ifarch aarch64
@@ -155,13 +154,8 @@
 %endif
 
 # build perf and cpupower tools
-%ifarch %{ix86} %{x86_64}
 %define build_perf		1
 %define build_cpupower		1
-%else
-%define build_perf		0
-%define build_cpupower		0
-%endif
 
 
 # compress modules with xz
@@ -1645,8 +1639,8 @@ cat ../kernel_exclude_debug_files.%{flavour} >> $kernel_files
 LC_ALL=C sed -ri "s/^EXTRAVERSION.*/EXTRAVERSION = -%{fullrpmrel}/" Makefile
 
 %if %{build_perf}
-%smake -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} NO_GTK2=1 all
-%smake -C tools/perf -s prefix=%{_prefix} NO_GTK2=1 man
+%smake -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} lib=%{_lib} NO_GTK2=1 all
+%smake -C tools/perf -s prefix=%{_prefix} lib=%{_lib} NO_GTK2=1 man
 %endif
 
 %if %{build_cpupower}
@@ -1732,7 +1726,7 @@ LC_ALL=C sed -ri "s/^EXTRAVERSION.*/EXTRAVERSION = -%{fullrpmrel}/" Makefile
 %if %{build_perf}
 
 # perf tool binary and supporting scripts/binaries
-make -C tools/perf -s V=1 DESTDIR=%{buildroot} HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install
+make -C tools/perf -s V=1 DESTDIR=%{buildroot} HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} lib=%{_lib} install
 
 # Versionize shebang (#!/usr/bin/env python -> #!/usr/bin/python3)
 sed -i -e '1 s,^.*$,#!%{__python3},' %{buildroot}%{_prefix}/libexec/perf-core/scripts/python/exported-sql-viewer.py