spl-patches/0006-Add-BuildRequires-gcc-make-elfutils-libelf-devel.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Tony Hutter <hutter2@llnl.gov>
   3 Date: Wed, 7 Nov 2018 22:13:20 -0800
   4 Subject: [PATCH] Add BuildRequires gcc, make, elfutils-libelf-devel
   5
   6 This adds a BuildRequires for gcc, make, and elfutils-libelf-devel
   7 into our spec files.  gcc has been a packaging requirement for
   8 awhile now:
   9
  10 https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B
  11
  12 These additional BuildRequires allow us to mock build in
  13 Fedora 29.
  14
  15 (This is the backported SPL equivalent of the original ZFS patch)
  16
  17 Reviewed-by: Neal Gompa <ngompa@datto.com>
  18 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
  19 Signed-off-by:  Tony Hutter <hutter2@llnl.gov>
  20 Closes #8095
  21 Closes #8102
  22
  23 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
  24 ---
  25  rpm/generic/spl-kmod.spec.in | 4 ++++
  26  rpm/generic/spl.spec.in      | 3 +++
  27  2 files changed, 7 insertions(+)
  28
  29 diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
  30 index 4cc1faf..f986cde 100644
  31 --- a/rpm/generic/spl-kmod.spec.in
  32 +++ b/rpm/generic/spl-kmod.spec.in
  33 @@ -26,6 +26,10 @@ URL:            http://zfsonlinux.org/
  34  Source0:        %{module}-%{version}.tar.gz
  35  Source10:       kmodtool
  36  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
  37 +%if 0%{?rhel}%{?fedora}
  38 +BuildRequires:  gcc, make
  39 +BuildRequires:  elfutils-libelf-devel
  40 +%endif
  41
  42  # The developments headers will conflict with the dkms packages.
  43  Conflicts:      %{module}-dkms
  44 diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
  45 index 4b3a3d7..b17c68e 100644
  46 --- a/rpm/generic/spl.spec.in
  47 +++ b/rpm/generic/spl.spec.in
  48 @@ -20,6 +20,9 @@ Source0:        %{name}-%{version}.tar.gz
  49  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  50  Requires:       %{name}-kmod = %{version}
  51  Provides:       %{name}-kmod-common = %{version}
  52 +%if 0%{?rhel}%{?fedora}%{?suse_version}
  53 +BuildRequires:  gcc, make
  54 +%endif
  55
  56  %description
  57  This package contains the commands to verify the SPL