| 1 |
commit: 7dde6a6bd36cadd1c70d8ec3d3f956750231eeff |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 6 03:17:56 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 03:18:32 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dde6a6b |
| 7 |
|
| 8 |
app-emulation/virtualbox: uncomment partial Python logic |
| 9 |
|
| 10 |
Went back and forth on this but I think it's worth |
| 11 |
hinting as much as possible for now, given it's |
| 12 |
completely guessing otherwise, and we can't |
| 13 |
easily just rip out / disable Python entirely |
| 14 |
until we fix this. |
| 15 |
|
| 16 |
Bug: https://bugs.gentoo.org/856121 |
| 17 |
Bug: https://bugs.gentoo.org/785835 |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
|
| 20 |
.../virtualbox/virtualbox-6.1.34-r3.ebuild | 24 ++++++++++------------ |
| 21 |
1 file changed, 11 insertions(+), 13 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild |
| 24 |
index a352a9dd329b..1475e06f6fa0 100644 |
| 25 |
--- a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild |
| 26 |
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild |
| 27 |
@@ -280,20 +280,18 @@ src_configure() { |
| 28 |
edo ./configure "${myconf[@]}" |
| 29 |
|
| 30 |
# Try to force usage of chosen Python implementation |
| 31 |
- # Commented out for now as it's insufficient (see comment above |
| 32 |
- # PYTHON_COMPAT). |
| 33 |
# bug #856121, bug #785835 |
| 34 |
- #sed -i \ |
| 35 |
- # -e '/VBOX_WITH_PYTHON.*=/d' \ |
| 36 |
- # -e '/VBOX_PATH_PYTHON_INC.*=/d' \ |
| 37 |
- # -e '/VBOX_LIB_PYTHON.*=/d' \ |
| 38 |
- # AutoConfig.kmk || die |
| 39 |
- # |
| 40 |
- #cat >> AutoConfig.kmk <<-EOF || die |
| 41 |
- # VBOX_WITH_PYTHON=$(usex python 1 0) |
| 42 |
- # VBOX_PATH_PYTHON_INC=$(python_get_includedir) |
| 43 |
- # VBOX_LIB_PYTHON=$(python_get_library_path) |
| 44 |
- #EOF |
| 45 |
+ sed -i \ |
| 46 |
+ -e '/VBOX_WITH_PYTHON.*=/d' \ |
| 47 |
+ -e '/VBOX_PATH_PYTHON_INC.*=/d' \ |
| 48 |
+ -e '/VBOX_LIB_PYTHON.*=/d' \ |
| 49 |
+ AutoConfig.kmk || die |
| 50 |
+ |
| 51 |
+ cat >> AutoConfig.kmk <<-EOF || die |
| 52 |
+ VBOX_WITH_PYTHON=$(usex python 1 0) |
| 53 |
+ VBOX_PATH_PYTHON_INC=$(python_get_includedir) |
| 54 |
+ VBOX_LIB_PYTHON=$(python_get_library_path) |
| 55 |
+ EOF |
| 56 |
} |
| 57 |
|
| 58 |
src_compile() { |
Archives