From: Ian Stakenvicius <axs@gentoo.org>
Date: Fri, 2 Sep 2016 15:08:57 +0000 (-0400)
Subject: app-emulation/virtualbox: backport commit 82049238b1 to 4.3.x
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=57cfaba176f27d42e3f7dfce27dabfd8aacef393;p=gentoo.git

app-emulation/virtualbox: backport commit 82049238b1 to 4.3.x

See Gentoo bug #488176

Package-Manager: portage-2.2.28
---

diff --git a/app-emulation/virtualbox/virtualbox-4.3.38.ebuild b/app-emulation/virtualbox/virtualbox-4.3.38.ebuild
index 4df13c2f46c9..e6d9597b850f 100644
--- a/app-emulation/virtualbox/virtualbox-4.3.38.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.38.ebuild
@@ -140,6 +140,10 @@ pkg_setup() {
 	fi
 	java-pkg-opt-2_pkg_setup
 	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
 }
 
 src_prepare() {
@@ -158,6 +162,10 @@ src_prepare() {
 	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
 		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
 
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s/ld /$(LD) /' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
 	# Use PAM only when pam USE flag is enbaled (bug #376531)
 	if ! use pam ; then
 		elog "Disabling PAM removes the possibility to use the VRDP features."
diff --git a/app-emulation/virtualbox/virtualbox-4.3.40.ebuild b/app-emulation/virtualbox/virtualbox-4.3.40.ebuild
index 7315c62bfd1b..3932926c17a1 100644
--- a/app-emulation/virtualbox/virtualbox-4.3.40.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.40.ebuild
@@ -140,6 +140,10 @@ pkg_setup() {
 	fi
 	java-pkg-opt-2_pkg_setup
 	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
 }
 
 src_prepare() {
@@ -158,6 +162,10 @@ src_prepare() {
 	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
 		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
 
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s/ld /$(LD) /' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
 	# Use PAM only when pam USE flag is enbaled (bug #376531)
 	if ! use pam ; then
 		elog "Disabling PAM removes the possibility to use the VRDP features."