diff --git a/app-emulation/virtualbox/virtualbox-4.3.38.ebuild b/app-emulation/virtualbox/virtualbox-4.3.38.ebuild index 4df13c2f46c90..e6d9597b850f5 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 7315c62bfd1bd..3932926c17a19 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."