From 3a40d2d6db734b46b4de9d51f46ff7fc042026fb Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Sep 04 2020 19:34:52 +0000 Subject: Workaound fatal GCC 9 compilation/link errors Fix conditionals for perl BuildRequires Signed-off-by: Merlin Mathesius --- diff --git a/ipxe.spec b/ipxe.spec index db03b99..20e2604 100644 --- a/ipxe.spec +++ b/ipxe.spec @@ -47,7 +47,7 @@ Name: ipxe Version: %{date} -Release: 8.git%{hash}%{?dist} +Release: 9.git%{hash}%{?dist} Summary: A network boot loader License: GPLv2 with additional permissions and BSD @@ -63,7 +63,7 @@ Patch0002: 0002-Use-spec-compliant-timeouts.patch %ifarch %{buildarches} BuildRequires: perl-interpreter BuildRequires: perl-Getopt-Long -%if 0%{?fedora} >= 33 +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 BuildRequires: perl-FindBin BuildRequires: perl-lib %endif @@ -144,6 +144,8 @@ rm -rf drivers/net/ath/ath9k make_ipxe() { make %{?_smp_mflags} \ NO_WERROR=1 V=1 \ + EXTRA_CFLAGS="-Wno-address-of-packed-member -Wno-enum-conversion -Wno-format-overflow" \ + EXTRA_LDFLAGS="-z muldefs" \ GITVERSION=%{hash} \ %if 0%{?cross} CROSS_COMPILE=x86_64-linux-gnu- \ @@ -236,6 +238,10 @@ done %endif %changelog +* Fri Sep 04 2020 Merlin Mathesius - 20190125-9.git36a4c85f +- Workaound fatal GCC 9 compilation/link errors +- Fix conditionals for perl BuildRequires + * Mon Aug 17 2020 Cole Robinson - 20190125-8.git36a4c85f - Revert HTTPS support, causes boot hangs with UEFI (bz 1869102)