summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-03 16:04:34 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-03 16:04:34 -0400
commit1fb2ddd2bd8921ca0ce9968f9d1ca8f0f39e03f8 (patch)
treed18116e4aaf7b0e8e8d27ebcd63a6876b87fe8ca
parent534118bd28f2b0fb61e8d7f25fad9e7c785b2837 (diff)
downloadkernel-1fb2ddd2bd8921ca0ce9968f9d1ca8f0f39e03f8.tar.gz
kernel-1fb2ddd2bd8921ca0ce9968f9d1ca8f0f39e03f8.tar.xz
kernel-1fb2ddd2bd8921ca0ce9968f9d1ca8f0f39e03f8.zip
Fix from Ngo Than for perf build on ppc64le (rhbz 1227260)
-rw-r--r--kernel.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index a5c87739..1849998a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1746,8 +1746,12 @@ BuildKernel %make_target %kernel_image %{pae}
BuildKernel %make_target %kernel_image
%endif
+%ifarch ppc64le
+%define no32bit NO_PERF_READ_VDSO32=1
+%endif
+
%global perf_make \
- make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
+ make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 %{?no32bit} WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
%if %{with_perf}
# perf
%{perf_make} DESTDIR=$RPM_BUILD_ROOT all
@@ -2196,6 +2200,9 @@ fi
#
#
%changelog
+* Wed Jun 03 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix from Ngo Than for perf build on ppc64le (rhbz 1227260)
+
* Wed Jun 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc6.git1.1
- Linux v4.1-rc6-44-g8cd9234c64c5