Use new toolchain helpers for selecting the bfd linker #438058 by Alexandre Rostovtsev.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 24 insertions, 29 deletions

diff --git a/sys-firmware/seabios/ChangeLog b/sys-firmware/seabios/ChangeLog
index f99f40d0c3a0..b716cd4db019 100644
--- a/sys-firmware/seabios/ChangeLog
+++ b/sys-firmware/seabios/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-firmware/seabios
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/ChangeLog,v 1.38 2015/02/15 08:02:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/ChangeLog,v 1.39 2015/03/16 21:22:12 vapier Exp $
+
+  16 Mar 2015; Mike Frysinger <vapier@gentoo.org> seabios-1.7.5-r1.ebuild,
+  seabios-1.7.5.ebuild:
+  Use new toolchain helpers for selecting the bfd linker #438058 by Alexandre
+  Rostovtsev.
 
 *seabios-1.7.5-r1 (15 Feb 2015)
 
diff --git a/sys-firmware/seabios/seabios-1.7.5-r1.ebuild b/sys-firmware/seabios/seabios-1.7.5-r1.ebuild
index e4186d0cc664..f91a05911252 100644
--- a/sys-firmware/seabios/seabios-1.7.5-r1.ebuild
+++ b/sys-firmware/seabios/seabios-1.7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/seabios-1.7.5-r1.ebuild,v 1.1 2015/02/15 08:02:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/seabios-1.7.5-r1.ebuild,v 1.2 2015/03/16 21:22:12 vapier Exp $
 
 EAPI=5
 
@@ -58,11 +58,6 @@ pkg_pretend() {
 		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
 		ewarn "in SeaBIOS."
 	fi
-
-	local myld=$(tc-getLD)
-
-	${myld} -v | grep -q "GNU gold" && \
-	ewarn "gold linker unable to handle 16-bit code using ld.bfd.  bug #438058"
 }
 
 pkg_setup() {
@@ -95,19 +90,19 @@ src_prepare() {
 }
 
 src_configure() {
-	:
+	use binary || tc-ld-disable-gold #438058
 }
 
 _emake() {
 	LANG=C \
 	emake V=1 \
-		CC=$(tc-getCC) \
-		LD="$(tc-getLD).bfd" \
-		AR=$(tc-getAR) \
-		OBJCOPY=$(tc-getOBJCOPY) \
-		RANLIB=$(tc-getRANLIB) \
-		OBJDUMP=$(tc-getPROG OBJDUMP objdump) \
-		HOST_CC=$(tc-getBUILD_CC) \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
 		"$@"
 }
 
diff --git a/sys-firmware/seabios/seabios-1.7.5.ebuild b/sys-firmware/seabios/seabios-1.7.5.ebuild
index 1c92d33025cb..6eda25045ccb 100644
--- a/sys-firmware/seabios/seabios-1.7.5.ebuild
+++ b/sys-firmware/seabios/seabios-1.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/seabios-1.7.5.ebuild,v 1.4 2015/02/15 07:07:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/seabios-1.7.5.ebuild,v 1.5 2015/03/16 21:22:12 vapier Exp $
 
 EAPI=5
 
@@ -53,11 +53,6 @@ pkg_pretend() {
 		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
 		ewarn "in SeaBIOS."
 	fi
-
-	local myld=$(tc-getLD)
-
-	${myld} -v | grep -q "GNU gold" && \
-	ewarn "gold linker unable to handle 16-bit code using ld.bfd.  bug #438058"
 }
 
 pkg_setup() {
@@ -86,19 +81,19 @@ src_prepare() {
 }
 
 src_configure() {
-	:
+	use binary || tc-ld-disable-gold #438058
 }
 
 src_compile() {
 	if ! use binary ; then
 		LANG=C emake \
-			CC=$(tc-getCC) \
-			LD="$(tc-getLD).bfd" \
-			AR=$(tc-getAR) \
-			OBJCOPY=$(tc-getOBJCOPY) \
-			RANLIB=$(tc-getRANLIB) \
-			OBJDUMP=$(tc-getPROG OBJDUMP objdump) \
-			HOST_CC=$(tc-getBUILD_CC) \
+			CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" \
+			AR="$(tc-getAR)" \
+			OBJCOPY="$(tc-getOBJCOPY)" \
+			RANLIB="$(tc-getRANLIB)" \
+			OBJDUMP="$(tc-getOBJDUMP)" \
+			HOST_CC="$(tc-getBUILD_CC)" \
 			out/bios.bin
 	fi
 }