commit:     349e168da5d78c75bd210ff893a7b580dfe5b4fe
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 22:05:41 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 22:05:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349e168d

sys-firmware/seabios: tweak linker script for binutils-2.36

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch | 9 +++++++++
 sys-firmware/seabios/seabios-1.14.0-r1.ebuild                 | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch 
b/sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch
new file mode 100644
index 00000000000..0453d203d4a
--- /dev/null
+++ b/sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch
@@ -0,0 +1,9 @@
+--- a/vgasrc/vgalayout.lds.S
++++ b/vgasrc/vgalayout.lds.S
+@@ -19,5 +19,5 @@ SECTIONS
+ 
+         // Discard regular data sections to force a link error if
+         // 16bit code attempts to access data not marked with VAR16.
+-        /DISCARD/ : { *(.text*) *(.rodata*) *(.data*) *(.bss*) *(COMMON) }
++        /DISCARD/ : { *(.text*) *(.rodata*) *(.data*) *(.bss*) *(COMMON) 
*(.note.gnu.property) }
+ }

diff --git a/sys-firmware/seabios/seabios-1.14.0-r1.ebuild 
b/sys-firmware/seabios/seabios-1.14.0-r1.ebuild
index a8b5184144a..f97b51857b5 100644
--- a/sys-firmware/seabios/seabios-1.14.0-r1.ebuild
+++ b/sys-firmware/seabios/seabios-1.14.0-r1.ebuild
@@ -95,6 +95,10 @@ src_unpack() {
 src_prepare() {
        default
 
+       if ! use binary; then
+               eapply "${FILESDIR}"/${PN}-1.14.0-binutils-2.36.patch
+       fi
+
        # Ensure precompiled iasl files are never used
        find "${WORKDIR}" -name '*.hex' -delete || die
 }

Reply via email to