summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-11-16 11:19:44 -0500
committerKyle McMartin <kyle@redhat.com>2011-11-16 11:19:44 -0500
commite20e75789d2e5efbacc72ae833a66bb77ba8e52a (patch)
tree8a434a49a1b2d3d367452393aa15434d6f646ccd /kernel.spec
parent6df08a430890c9767ac5c07417bd8cc2f2ab9b3a (diff)
downloadkernel-e20e75789d2e5efbacc72ae833a66bb77ba8e52a.tar.gz
kernel-e20e75789d2e5efbacc72ae833a66bb77ba8e52a.tar.xz
kernel-e20e75789d2e5efbacc72ae833a66bb77ba8e52a.zip
Work around #663080 and restore building 'perf' on s390x.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec6
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index cfeb15a13..a8c47f595 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1684,7 +1684,7 @@ BuildKernel %make_target %kernel_image smp
%if %{with_perf}
# perf
-make %{?_smp_mflags} -C tools/perf -s V=1 HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all
+make %{?_smp_mflags} -C tools/perf -s V=1 EXTRA_CFLAGS="-Wno-error=array-bounds" HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all
make %{?_smp_mflags} -C tools/perf -s V=1 prefix=%{_prefix} man || %{doc_build_fail}
%endif
@@ -2067,6 +2067,10 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Nov 16 2011 Kyle McMartin <kmcmartin@redhat.com>
+- Work around #663080 and restore building 'perf' on s390x (we don't need
+ kernel-tools since cpuspeed isn't needed on s390...)
+
* Wed Nov 16 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.2-rc2-git1