| 1 |
commit: 1aebf0a854ed6cad6b4414767d6d6bb89da311c9 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 12 01:59:41 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 12 02:45:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aebf0a8 |
| 7 |
|
| 8 |
app-emulation/virtualbox: allow disabling PCH |
| 9 |
|
| 10 |
Persistent hard to debug build failures. |
| 11 |
|
| 12 |
It's fragile and I'm about to use.mask it globally anyway. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/753323 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild | 9 +++++++-- |
| 18 |
app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild | 9 +++++++-- |
| 19 |
app-emulation/virtualbox/virtualbox-6.1.30.ebuild | 9 +++++++-- |
| 20 |
3 files changed, 21 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild |
| 23 |
index ce665d5a21ae..9452a3fe11ba 100644 |
| 24 |
--- a/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild |
| 25 |
+++ b/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2021 Gentoo Authors |
| 28 |
+# Copyright 1999-2022 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=7 |
| 32 |
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )" |
| 33 |
SLOT="0/$(ver_cut 1-2)" |
| 34 |
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ |
| 35 |
KEYWORDS="amd64" |
| 36 |
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
| 37 |
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
| 38 |
|
| 39 |
CDEPEND=" |
| 40 |
${PYTHON_DEPS} |
| 41 |
@@ -179,6 +179,11 @@ src_prepare() { |
| 42 |
sed -e "s@MY_LIBDIR@$(get_libdir)@" \ |
| 43 |
"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die |
| 44 |
|
| 45 |
+ if ! use pch ; then |
| 46 |
+ # bug #753323 |
| 47 |
+ echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die |
| 48 |
+ fi |
| 49 |
+ |
| 50 |
# Respect LDFLAGS |
| 51 |
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ |
| 52 |
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die |
| 53 |
|
| 54 |
diff --git a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild |
| 55 |
index 0576c10043d7..c68f8924cbf5 100644 |
| 56 |
--- a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild |
| 57 |
+++ b/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild |
| 58 |
@@ -1,4 +1,4 @@ |
| 59 |
-# Copyright 2021 Gentoo Authors |
| 60 |
+# Copyright 2022 Gentoo Authors |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
EAPI=7 |
| 64 |
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )" |
| 65 |
SLOT="0/$(ver_cut 1-2)" |
| 66 |
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ |
| 67 |
KEYWORDS="amd64" |
| 68 |
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
| 69 |
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
| 70 |
|
| 71 |
COMMON_DEPEND=" |
| 72 |
${PYTHON_DEPS} |
| 73 |
@@ -179,6 +179,11 @@ src_prepare() { |
| 74 |
sed -e "s@MY_LIBDIR@$(get_libdir)@" \ |
| 75 |
"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die |
| 76 |
|
| 77 |
+ if ! use pch ; then |
| 78 |
+ # bug #753323 |
| 79 |
+ echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die |
| 80 |
+ fi |
| 81 |
+ |
| 82 |
# Respect LDFLAGS |
| 83 |
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ |
| 84 |
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die |
| 85 |
|
| 86 |
diff --git a/app-emulation/virtualbox/virtualbox-6.1.30.ebuild b/app-emulation/virtualbox/virtualbox-6.1.30.ebuild |
| 87 |
index 358382f4a8b7..de42d1ff09e7 100644 |
| 88 |
--- a/app-emulation/virtualbox/virtualbox-6.1.30.ebuild |
| 89 |
+++ b/app-emulation/virtualbox/virtualbox-6.1.30.ebuild |
| 90 |
@@ -1,4 +1,4 @@ |
| 91 |
-# Copyright 2021 Gentoo Authors |
| 92 |
+# Copyright 2022 Gentoo Authors |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
|
| 95 |
EAPI=7 |
| 96 |
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )" |
| 97 |
SLOT="0/$(ver_cut 1-2)" |
| 98 |
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ |
| 99 |
KEYWORDS="~amd64" |
| 100 |
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
| 101 |
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
| 102 |
|
| 103 |
COMMON_DEPEND=" |
| 104 |
${PYTHON_DEPS} |
| 105 |
@@ -179,6 +179,11 @@ src_prepare() { |
| 106 |
sed -e "s@MY_LIBDIR@$(get_libdir)@" \ |
| 107 |
"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die |
| 108 |
|
| 109 |
+ if ! use pch ; then |
| 110 |
+ # bug #753323 |
| 111 |
+ echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die |
| 112 |
+ fi |
| 113 |
+ |
| 114 |
# Respect LDFLAGS |
| 115 |
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ |
| 116 |
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die |
Archives