diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2016-09-02 11:08:57 -0400 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2016-09-02 11:08:57 -0400 |
| commit | 57cfaba176f27d42e3f7dfce27dabfd8aacef393 (patch) | |
| tree | b15719a4010ba1e2b913a935312f3c371b4783a0 /app-emulation | |
| parent | app-emulation/libvirt: call enewuser with correct no of args, bug #592684 (diff) | |
| download | gentoo-57cfaba176f27d42e3f7dfce27dabfd8aacef393.tar.gz gentoo-57cfaba176f27d42e3f7dfce27dabfd8aacef393.tar.bz2 gentoo-57cfaba176f27d42e3f7dfce27dabfd8aacef393.zip | |
app-emulation/virtualbox: backport commit 82049238b1 to 4.3.x
See Gentoo bug #488176
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-4.3.38.ebuild | 8 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-4.3.40.ebuild | 8 |
2 files changed, 16 insertions, 0 deletions
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." |