#1 Fix FTBFS errors for Rawhide/ELN
Merged 3 years ago by rjones. Opened 3 years ago by merlinm.
rpms/ merlinm/ipxe gcc-9-and-perl-BR  into  master

file modified
+8 -2
@@ -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 @@ 

  %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 @@ 

  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 @@ 

  %endif

  

  %changelog

+ * Fri Sep 04 2020 Merlin Mathesius <mmathesi@redhat.com> - 20190125-9.git36a4c85f

+ - Workaound fatal GCC 9 compilation/link errors

+ - Fix conditionals for perl BuildRequires

+ 

  * Mon Aug 17 2020 Cole Robinson <aintdiscole@gmail.com> - 20190125-8.git36a4c85f

  - Revert HTTPS support, causes boot hangs with UEFI (bz 1869102)

  

This package currently FTBFS for Rawhide and ELN. This PR addresses two problems causing that:

  • Workaround fatal GCC 9 compilation/link errors
  • Fix conditionals for perl BuildRequires

Current failing Rawhide scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=50776370
Current failing ELN build: https://koji.fedoraproject.org/koji/taskinfo?taskID=50510632

Successful Rawhide scratch build with this PR: http://koji.fedoraproject.org/koji/taskinfo?taskID=50771921
Successful ELN scratch build with this PR: http://koji.fedoraproject.org/koji/taskinfo?taskID=50771926
Successful F33 scratch build with this PR: https://koji.fedoraproject.org/koji/taskinfo?taskID=50776129
Successful F32 scratch build with this PR: https://koji.fedoraproject.org/koji/taskinfo?taskID=50776131

In a local build I'm able to reproduce both the warnings and more seriously:

x86_64-linux-gnu-ld: bin-x86_64-efi/blib.a(dmfe.o):(.bss+0x0): multiple definition of `_shared_bss'; bin-x86_64-efi/blib.a(davicom.o):(.bss+0x0): first defined here

which breaks the build. What's really strange here is that we've just had several successful builds in Fedora Rawhide, which should be impossible.

In any case this change looks obviously correct so I will merge it, thanks.

Pull-Request has been merged by rjones

3 years ago