From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Hutter Date: Wed, 7 Nov 2018 22:13:20 -0800 Subject: [PATCH] Add BuildRequires gcc, make, elfutils-libelf-devel This adds a BuildRequires for gcc, make, and elfutils-libelf-devel into our spec files. gcc has been a packaging requirement for awhile now: https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B These additional BuildRequires allow us to mock build in Fedora 29. (This is the backported SPL equivalent of the original ZFS patch) Reviewed-by: Neal Gompa Reviewed-by: Brian Behlendorf Signed-off-by: Tony Hutter Closes #8095 Closes #8102 Signed-off-by: Stoiko Ivanov --- rpm/generic/spl-kmod.spec.in | 4 ++++ rpm/generic/spl.spec.in | 3 +++ 2 files changed, 7 insertions(+) diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in index 4cc1faf..f986cde 100644 --- a/rpm/generic/spl-kmod.spec.in +++ b/rpm/generic/spl-kmod.spec.in @@ -26,6 +26,10 @@ URL: http://zfsonlinux.org/ Source0: %{module}-%{version}.tar.gz Source10: kmodtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n) +%if 0%{?rhel}%{?fedora} +BuildRequires: gcc, make +BuildRequires: elfutils-libelf-devel +%endif # The developments headers will conflict with the dkms packages. Conflicts: %{module}-dkms diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in index 4b3a3d7..b17c68e 100644 --- a/rpm/generic/spl.spec.in +++ b/rpm/generic/spl.spec.in @@ -20,6 +20,9 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-kmod = %{version} Provides: %{name}-kmod-common = %{version} +%if 0%{?rhel}%{?fedora}%{?suse_version} +BuildRequires: gcc, make +%endif %description This package contains the commands to verify the SPL