diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-11-16 14:31:36 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-11-16 14:31:36 -0500 |
| commit | 8bcddfb0331de682e3f88070411fb76dd3462785 (patch) | |
| tree | 85223442930717fc54b243822eaf14d3dc1eba2c | |
| parent | e20e75789d2e5efbacc72ae833a66bb77ba8e52a (diff) | |
| download | kernel-8bcddfb0331de682e3f88070411fb76dd3462785.tar.gz kernel-8bcddfb0331de682e3f88070411fb76dd3462785.tar.xz kernel-8bcddfb0331de682e3f88070411fb76dd3462785.zip | |
Avoid CFLAGS changing across building perf
| -rw-r--r-- | kernel.spec | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index a8c47f595..6474a3dd1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1682,10 +1682,12 @@ BuildKernel %make_target %kernel_image BuildKernel %make_target %kernel_image smp %endif +%global perf_make \ + make %{?_smp_mflags} -C tools/perf -s V=1 EXTRA_CFLAGS="-Wno-error=array-bounds" HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} %if %{with_perf} # perf -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} +%{perf_make} all +%{perf_make} man || %{doc_build_fail} %endif %if %{with_tools} @@ -1788,13 +1790,13 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h %if %{with_perf} # perf tool binary and supporting scripts/binaries -make -C tools/perf -s V=1 DESTDIR=$RPM_BUILD_ROOT HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install +%{perf_make} DESTDIR=$RPM_BUILD_ROOT install # python-perf extension -make -C tools/perf -s V=1 DESTDIR=$RPM_BUILD_ROOT HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install-python_ext +%{perf_make} DESTDIR=$RPM_BUILD_ROOT install-python_ext # perf man pages (note: implicit rpm magic compresses them later) -make -C tools/perf -s V=1 DESTDIR=$RPM_BUILD_ROOT HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install-man || %{doc_build_fail} +%{perf_make} DESTDIR=$RPM_BUILD_ROOT install-man || %{doc_build_fail} %endif %if %{with_tools} @@ -2070,6 +2072,8 @@ fi * 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...) +- Restore %{perf_make} to ensure CFLAGS doesn't change across building + perf. * Wed Nov 16 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.2-rc2-git1 |