summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Tibbitts <tibbs@math.uh.edu>2016-08-04 04:06:46 -0500
committerLaura Abbott <labbott@fedoraproject.org>2016-08-05 02:18:24 -0700
commite986b232bb7a13d69114805245d0f42699e4829e (patch)
treec6bd9607aea0c48a6987c184e2b9261d80dcce5b
parent2117aca69504d22b10c8304b8043a7331183ae80 (diff)
downloadkernel-e986b232bb7a13d69114805245d0f42699e4829e.tar.gz
kernel-e986b232bb7a13d69114805245d0f42699e4829e.tar.xz
kernel-e986b232bb7a13d69114805245d0f42699e4829e.zip
kernel.spec: Fix build dep on libelf-devel
The dependency on libelf-devel is wrapped in "%if %{with_perf}". However, if you're building without perf (as fast-build.sh does) then you don't have this installed and the build will complain: Makefile:1037: "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel" This just lifts the dependency out of the %if section.
-rw-r--r--kernel.spec4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 558f199f6..3228781f9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -373,12 +373,12 @@ Requires: kernel-modules-uname-r = %{KVERREL}%{?variant}
BuildRequires: kmod, patch, bash, sh-utils, tar, git
BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc
-BuildRequires: net-tools, hostname, bc
+BuildRequires: net-tools, hostname, bc, elfutils-devel
%if %{with_sparse}
BuildRequires: sparse
%endif
%if %{with_perf}
-BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex xz-devel
+BuildRequires: zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex xz-devel
BuildRequires: audit-libs-devel
%ifnarch s390 s390x %{arm}
BuildRequires: numactl-devel