| 1 |
commit: 57cfaba176f27d42e3f7dfce27dabfd8aacef393 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 15:08:57 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 15:08:57 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57cfaba1 |
| 7 |
|
| 8 |
app-emulation/virtualbox: backport commit 82049238b1 to 4.3.x |
| 9 |
|
| 10 |
See Gentoo bug #488176 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
app-emulation/virtualbox/virtualbox-4.3.38.ebuild | 8 ++++++++ |
| 15 |
app-emulation/virtualbox/virtualbox-4.3.40.ebuild | 8 ++++++++ |
| 16 |
2 files changed, 16 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-emulation/virtualbox/virtualbox-4.3.38.ebuild b/app-emulation/virtualbox/virtualbox-4.3.38.ebuild |
| 19 |
index 4df13c2..e6d9597 100644 |
| 20 |
--- a/app-emulation/virtualbox/virtualbox-4.3.38.ebuild |
| 21 |
+++ b/app-emulation/virtualbox/virtualbox-4.3.38.ebuild |
| 22 |
@@ -140,6 +140,10 @@ pkg_setup() { |
| 23 |
fi |
| 24 |
java-pkg-opt-2_pkg_setup |
| 25 |
python-single-r1_pkg_setup |
| 26 |
+ |
| 27 |
+ tc-ld-disable-gold #bug 488176 |
| 28 |
+ tc-export CC CXX LD AR RANLIB |
| 29 |
+ export HOST_CC="$(tc-getBUILD_CC)" |
| 30 |
} |
| 31 |
|
| 32 |
src_prepare() { |
| 33 |
@@ -158,6 +162,10 @@ src_prepare() { |
| 34 |
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ |
| 35 |
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die |
| 36 |
|
| 37 |
+ # Do not use hard-coded ld (related to bug #488176) |
| 38 |
+ sed -e '/QUIET)ld /s/ld /$(LD) /' \ |
| 39 |
+ -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die |
| 40 |
+ |
| 41 |
# Use PAM only when pam USE flag is enbaled (bug #376531) |
| 42 |
if ! use pam ; then |
| 43 |
elog "Disabling PAM removes the possibility to use the VRDP features." |
| 44 |
|
| 45 |
diff --git a/app-emulation/virtualbox/virtualbox-4.3.40.ebuild b/app-emulation/virtualbox/virtualbox-4.3.40.ebuild |
| 46 |
index 7315c62..3932926 100644 |
| 47 |
--- a/app-emulation/virtualbox/virtualbox-4.3.40.ebuild |
| 48 |
+++ b/app-emulation/virtualbox/virtualbox-4.3.40.ebuild |
| 49 |
@@ -140,6 +140,10 @@ pkg_setup() { |
| 50 |
fi |
| 51 |
java-pkg-opt-2_pkg_setup |
| 52 |
python-single-r1_pkg_setup |
| 53 |
+ |
| 54 |
+ tc-ld-disable-gold #bug 488176 |
| 55 |
+ tc-export CC CXX LD AR RANLIB |
| 56 |
+ export HOST_CC="$(tc-getBUILD_CC)" |
| 57 |
} |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
@@ -158,6 +162,10 @@ src_prepare() { |
| 61 |
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ |
| 62 |
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die |
| 63 |
|
| 64 |
+ # Do not use hard-coded ld (related to bug #488176) |
| 65 |
+ sed -e '/QUIET)ld /s/ld /$(LD) /' \ |
| 66 |
+ -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die |
| 67 |
+ |
| 68 |
# Use PAM only when pam USE flag is enbaled (bug #376531) |
| 69 |
if ! use pam ; then |
| 70 |
elog "Disabling PAM removes the possibility to use the VRDP features." |
Archives