- Use nickc's workaround for #492183

This commit is contained in:
Peter Jones 2009-04-03 17:56:52 +00:00
parent 9327632a9c
commit 7ed20e5c1d
2 changed files with 34 additions and 3 deletions

View File

@ -0,0 +1,25 @@
diff --git a/gnuefi/elf_ia32_efi.lds b/gnuefi/elf_ia32_efi.lds
index bc29799..b15b36d 100644
--- a/gnuefi/elf_ia32_efi.lds
+++ b/gnuefi/elf_ia32_efi.lds
@@ -58,5 +58,7 @@ SECTIONS
{
*(.rel.reloc)
*(.eh_frame)
+ *(.note.GNU-stack)
}
+ .comment 0 : { *(.comment) }
}
diff --git a/gnuefi/elf_x86_64_efi.lds b/gnuefi/elf_x86_64_efi.lds
index 9c0a9f8..d0ae5f0 100644
--- a/gnuefi/elf_x86_64_efi.lds
+++ b/gnuefi/elf_x86_64_efi.lds
@@ -54,5 +54,8 @@ SECTIONS
.ignored.reloc :
{
*(.rela.reloc)
+ *(.eh_frame)
+ *(.note.GNU-stack)
}
+ .comment 0 : { *(.comment) }
}

View File

@ -1,14 +1,14 @@
Summary: Development Libraries and headers for EFI Summary: Development Libraries and headers for EFI
Name: gnu-efi Name: gnu-efi
Version: 3.0e Version: 3.0e
Release: 6%{?dist} Release: 7%{?dist}
Group: Development/System Group: Development/System
License: GPLv2+ License: GPLv2+
URL: ftp://ftp.hpl.hp.com/pub/linux-ia64 URL: ftp://ftp.hpl.hp.com/pub/linux-ia64
Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.bz2 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.bz2
Patch0: gnu-efi-3.0e-no-relocations.patch Patch0: gnu-efi-3.0e-no-relocations.patch
Patch1: gnu-efi-3.0e-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch Patch1: gnu-efi-3.0e-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
Patch2: gnu-efi-3.0e-pad-all-sections.patch Patch2: gnu-efi-3.0e-ignore-gnu-stack
Patch3: gnu-efi-3.0d-unwrap.patch Patch3: gnu-efi-3.0d-unwrap.patch
Patch4: gnu-efi-3.0d-uefi_wrap.patch Patch4: gnu-efi-3.0d-uefi_wrap.patch
Patch5: gnu-efi-3.0d-uefi_wrap_call10.patch Patch5: gnu-efi-3.0d-uefi_wrap_call10.patch
@ -23,7 +23,7 @@ applications that run under EFI (Extensible Firmware Interface).
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
#%patch2 -p1 %patch2 -p1
# these are currently disabled as we don't need them per se, and they # these are currently disabled as we don't need them per se, and they
# haven't gone upstream yet either. Also #2 and #3 haven't been updated # haven't gone upstream yet either. Also #2 and #3 haven't been updated
# to work with gnu-efi-3.0e yet. # to work with gnu-efi-3.0e yet.
@ -57,6 +57,12 @@ rm -rf %{buildroot}
%{_libdir}/* %{_libdir}/*
%changelog %changelog
* Fri Apr 03 2009 Peter Jones <pjones@redhat.com> - 3.0e-7
- Use nickc's workaround for #492183
* Tue Mar 31 2009 Peter Jones <pjones@redhat.com> - 3.0e-6.1
- Make a test package for nickc.
* Thu Mar 12 2009 Chris Lumens <clumens@redhat.com> 3.0e-6 * Thu Mar 12 2009 Chris Lumens <clumens@redhat.com> 3.0e-6
- Add IA64 back into the list of build arches (#489544). - Add IA64 back into the list of build arches (#489544).