commit: 7dde6a6bd36cadd1c70d8ec3d3f956750231eeff Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jul 6 03:17:56 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jul 6 03:18:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dde6a6b
app-emulation/virtualbox: uncomment partial Python logic Went back and forth on this but I think it's worth hinting as much as possible for now, given it's completely guessing otherwise, and we can't easily just rip out / disable Python entirely until we fix this. Bug: https://bugs.gentoo.org/856121 Bug: https://bugs.gentoo.org/785835 Signed-off-by: Sam James <sam <AT> gentoo.org> .../virtualbox/virtualbox-6.1.34-r3.ebuild | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild index a352a9dd329b..1475e06f6fa0 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild @@ -280,20 +280,18 @@ src_configure() { edo ./configure "${myconf[@]}" # Try to force usage of chosen Python implementation - # Commented out for now as it's insufficient (see comment above - # PYTHON_COMPAT). # bug #856121, bug #785835 - #sed -i \ - # -e '/VBOX_WITH_PYTHON.*=/d' \ - # -e '/VBOX_PATH_PYTHON_INC.*=/d' \ - # -e '/VBOX_LIB_PYTHON.*=/d' \ - # AutoConfig.kmk || die - # - #cat >> AutoConfig.kmk <<-EOF || die - # VBOX_WITH_PYTHON=$(usex python 1 0) - # VBOX_PATH_PYTHON_INC=$(python_get_includedir) - # VBOX_LIB_PYTHON=$(python_get_library_path) - #EOF + sed -i \ + -e '/VBOX_WITH_PYTHON.*=/d' \ + -e '/VBOX_PATH_PYTHON_INC.*=/d' \ + -e '/VBOX_LIB_PYTHON.*=/d' \ + AutoConfig.kmk || die + + cat >> AutoConfig.kmk <<-EOF || die + VBOX_WITH_PYTHON=$(usex python 1 0) + VBOX_PATH_PYTHON_INC=$(python_get_includedir) + VBOX_LIB_PYTHON=$(python_get_library_path) + EOF } src_compile() {
