]> git.proxmox.com Git - zfsonlinux.git/blob - zfs-patches/0019-Add-BuildRequires-gcc-make-elfutils-libelf-devel.patch
update/rebase to zfs-0.7.12 with patches from ZOL
[zfsonlinux.git] / zfs-patches / 0019-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 15:48:24 -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 Reviewed-by: Neal Gompa <ngompa@datto.com>
16 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
17 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
18 Closes #8095
19 Closes #8102
20 ---
21 rpm/generic/zfs-kmod.spec.in | 4 ++++
22 rpm/generic/zfs.spec.in | 1 +
23 2 files changed, 5 insertions(+)
24
25 diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in
26 index d4746f5b..ecf14ece 100644
27 --- a/rpm/generic/zfs-kmod.spec.in
28 +++ b/rpm/generic/zfs-kmod.spec.in
29 @@ -52,6 +52,10 @@ URL: http://zfsonlinux.org/
30 Source0: %{module}-%{version}.tar.gz
31 Source10: kmodtool
32 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
33 +%if 0%{?rhel}%{?fedora}
34 +BuildRequires: gcc, make
35 +BuildRequires: elfutils-libelf-devel
36 +%endif
37
38 # The developments headers will conflict with the dkms packages.
39 Conflicts: %{module}-dkms
40 diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
41 index fa6f1571..c1b8f2c8 100644
42 --- a/rpm/generic/zfs.spec.in
43 +++ b/rpm/generic/zfs.spec.in
44 @@ -91,6 +91,7 @@ Provides: %{name}-kmod-common = %{version}
45 Conflicts: zfs-fuse
46
47 %if 0%{?rhel}%{?fedora}%{?suse_version}
48 +BuildRequires: gcc, make
49 BuildRequires: zlib-devel
50 BuildRequires: libuuid-devel
51 BuildRequires: libblkid-devel