summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-01-12 01:59:41 +0000
committerSam James <sam@gentoo.org>2022-01-12 02:45:17 +0000
commit1aebf0a854ed6cad6b4414767d6d6bb89da311c9 (patch)
tree76e2b67c392e6aa4a907b695dca9312ec4b06cad /app-emulation
parentnet-fs/autofs: restore 5.1.6 due to musl breakage (diff)
downloadgentoo-1aebf0a854ed6cad6b4414767d6d6bb89da311c9.tar.gz
gentoo-1aebf0a854ed6cad6b4414767d6d6bb89da311c9.tar.bz2
gentoo-1aebf0a854ed6cad6b4414767d6d6bb89da311c9.zip
app-emulation/virtualbox: allow disabling PCH
Persistent hard to debug build failures. It's fragile and I'm about to use.mask it globally anyway. Closes: https://bugs.gentoo.org/753323 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild9
-rw-r--r--app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild9
-rw-r--r--app-emulation/virtualbox/virtualbox-6.1.30.ebuild9
3 files changed, 21 insertions, 6 deletions
diff --git a/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild
index ce665d5a21ae..9452a3fe11ba 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
SLOT="0/$(ver_cut 1-2)"
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
CDEPEND="
${PYTHON_DEPS}
@@ -179,6 +179,11 @@ src_prepare() {
sed -e "s@MY_LIBDIR@$(get_libdir)@" \
"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+ if ! use pch ; then
+ # bug #753323
+ echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die
+ fi
+
# Respect LDFLAGS
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
diff --git a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild
index 0576c10043d7..c68f8924cbf5 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
SLOT="0/$(ver_cut 1-2)"
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
COMMON_DEPEND="
${PYTHON_DEPS}
@@ -179,6 +179,11 @@ src_prepare() {
sed -e "s@MY_LIBDIR@$(get_libdir)@" \
"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+ if ! use pch ; then
+ # bug #753323
+ echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die
+ fi
+
# Respect LDFLAGS
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
diff --git a/app-emulation/virtualbox/virtualbox-6.1.30.ebuild b/app-emulation/virtualbox/virtualbox-6.1.30.ebuild
index 358382f4a8b7..de42d1ff09e7 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.30.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
SLOT="0/$(ver_cut 1-2)"
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
KEYWORDS="~amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
COMMON_DEPEND="
${PYTHON_DEPS}
@@ -179,6 +179,11 @@ src_prepare() {
sed -e "s@MY_LIBDIR@$(get_libdir)@" \
"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+ if ! use pch ; then
+ # bug #753323
+ echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die
+ fi
+
# Respect LDFLAGS
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die