commit: 2ff3aef792dca9939fac29dcc977e79d27bc9290
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 5 06:44:21 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 04:48:54 2025 +0000
URL:
https://gitweb.gentoo.org/proj/virtualbox-patches.git/commit/?id=2ff3aef7
Update python patch
Remove all that python versions enumeration, we have the include file
from the ebuild.
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
...python.patch => 026_virtualbox-7.1.10-python.patch} | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/patches/026_virtualbox-7.1.0_pre1-python.patch
b/patches/026_virtualbox-7.1.10-python.patch
similarity index 56%
rename from patches/026_virtualbox-7.1.0_pre1-python.patch
rename to patches/026_virtualbox-7.1.10-python.patch
index 73d5296..af8f2e2 100644
--- a/patches/026_virtualbox-7.1.0_pre1-python.patch
+++ b/patches/026_virtualbox-7.1.10-python.patch
@@ -4,11 +4,22 @@ use it.
Upstream added support for pyton up to 3.12.
+Remove version enumeration, always use VBOX_PATH_PYTHON_INC.
+
--- a/src/libs/xpcom18a4/python/Makefile.kmk
+++ b/src/libs/xpcom18a4/python/Makefile.kmk
-@@ -704,13 +704,6 @@
+@@ -700,22 +700,11 @@
+ # TODO: ASSUMING that we don't need a different headers for pymalloc
+ # ('m' builds < 3.8) and CRT malloc.
+ #
+- VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 37 38 39
310 311 312 34 33 \
+- ,$(if-expr
defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr
defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
+- ifneq ($(VBOX_PYTHON_LIMITED_API_VER),)
+ DLLS += VBoxPython3
+ VBoxPython3_EXTENDS = VBoxPythonBase
VBoxPython3_DEFS = $(filter-out
VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS)) Py_LIMITED_API=0x03030000
- VBoxPython3_INCS = $(VBoxPythonBase_INCS)
$(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
+- VBoxPython3_INCS = $(VBoxPythonBase_INCS)
$(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
++ VBoxPython3_INCS = $(VBoxPythonBase_INCS) $(VBOX_PATH_PYTHON_INC)
VBoxPython3_LDFLAGS.darwin = -undefined dynamic_lookup
-
- ifneq ($(KBUILD_TARGET),darwin)
@@ -17,6 +28,7 @@ Upstream added support for pyton up to 3.12.
- VBoxPython3m_DEFS = $(filter-out
VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_m_DEFS)) Py_LIMITED_API=0x03030000
- VBoxPython3m_INCS = $(VBoxPythonBase_m_INCS)
$(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
- endif
- endif
+- endif
endif # VBOX_WITH_PYTHON_LIMITED_API
+ endif # VBOX_ONLY_SDK
