77 lines
3.5 KiB
Diff
77 lines
3.5 KiB
Diff
diff --git a/configure b/configure
|
|
index 65a39770f6f..465baafb1a5 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -2187,7 +2187,7 @@ extern "C" int main(void)
|
|
}
|
|
EOF
|
|
found=
|
|
- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.9 python3.10 python3.11 python3.12"
|
|
+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.9 python3.10 python3.11 python3.12 python3.13"
|
|
for p in $PYTHONDIR; do
|
|
for d in $SUPPYTHONLIBS; do
|
|
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
|
|
diff --git a/src/libs/xpcom18a4/python/gen_python_deps.py b/src/libs/xpcom18a4/python/gen_python_deps.py
|
|
index 1e5add1c5f0..cc62b689e13 100755
|
|
--- a/src/libs/xpcom18a4/python/gen_python_deps.py
|
|
+++ b/src/libs/xpcom18a4/python/gen_python_deps.py
|
|
@@ -29,7 +29,7 @@ if sys.version_info >= (3, 10):
|
|
else:
|
|
from distutils.version import StrictVersion as Version
|
|
|
|
-versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.9", "3.10", "3.11", "3.12" ]
|
|
+versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ]
|
|
prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
|
|
known = {}
|
|
|
|
diff --git a/src/libs/xpcom18a4/python/Makefile.kmk b/src/libs/xpcom18a4/python/Makefile.kmk
|
|
index d3aea2dd2dd..fe6a1db9ee4 100644
|
|
--- a/src/libs/xpcom18a4/python/Makefile.kmk
|
|
+++ b/src/libs/xpcom18a4/python/Makefile.kmk
|
|
@@ -616,23 +616,23 @@ ifndef VBOX_ONLY_SDK
|
|
endif
|
|
endif
|
|
|
|
- ifdef VBOX_PYTHON311_INC
|
|
+ ifdef VBOX_PYTHON313_INC
|
|
#
|
|
- # Python 3.11 version (implicitly with pymalloc)
|
|
+ # Python 3.13 version (implicitly with pymalloc)
|
|
#
|
|
- DLLS += VBoxPython3_11
|
|
- VBoxPython3_11_EXTENDS = VBoxPythonBase
|
|
- VBoxPython3_11_EXTENDS_BY = appending
|
|
- VBoxPython3_11_INCS = $(VBOX_PYTHON311_INC)
|
|
- VBoxPython3_11_LIBS = $(VBOX_PYTHON311_LIB)
|
|
+ DLLS += VBoxPython3_13
|
|
+ VBoxPython3_13_EXTENDS = VBoxPythonBase
|
|
+ VBoxPython3_13_EXTENDS_BY = appending
|
|
+ VBoxPython3_13_INCS = $(VBOX_PYTHON313_INC)
|
|
+ VBoxPython3_13_LIBS = $(VBOX_PYTHON313_LIB)
|
|
|
|
ifdef VBOX_WITH_32_ON_64_MAIN_API
|
|
- ifdef VBOX_PYTHON311_LIB_X86
|
|
- DLLS += VBoxPython3_11_x86
|
|
- VBoxPython3_11_x86_EXTENDS = VBoxPythonBase_x86
|
|
- VBoxPython3_11_x86_EXTENDS_BY = appending
|
|
- VBoxPython3_11_x86_INCS = $(VBOX_PYTHON311_INC)
|
|
- VBoxPython3_11_x86_LIBS = $(VBOX_PYTHON311_LIB_X86)
|
|
+ ifdef VBOX_PYTHON313_LIB_X86
|
|
+ DLLS += VBoxPython3_13_x86
|
|
+ VBoxPython3_13_x86_EXTENDS = VBoxPythonBase_x86
|
|
+ VBoxPython3_13_x86_EXTENDS_BY = appending
|
|
+ VBoxPython3_13_x86_INCS = $(VBOX_PYTHON313_INC)
|
|
+ VBoxPython3_13_x86_LIBS = $(VBOX_PYTHON313_LIB_X86)
|
|
endif
|
|
endif
|
|
endif
|
|
@@ -700,7 +700,7 @@ ifndef VBOX_ONLY_SDK
|
|
# 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 \
|
|
+ VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 37 38 39 310 313 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
|