diff options
author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2023-04-20 21:24:36 +0000 |
---|---|---|
committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2023-04-20 21:24:36 +0000 |
commit | e9dcd13b7ca14ad5c8b6ac9aee78057f3d41a8ec (patch) | |
tree | 5f961291be68afe45d944e20fed3e9ca6a75da4b | |
parent | 0d04aa73706d867f82fbf3cc2043021b3c390388 (diff) | |
download | VirtualBox-svn-e9dcd13b7ca14ad5c8b6ac9aee78057f3d41a8ec.tar.gz |
configure, xpcom/python: Handle versions up to Python 3.12, and remove the useless handling of the 'm' suffix after 3.8 when it became the only existing variant.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@99496 cfe28804-0f27-0410-a406-dd0f0b0b656f
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | src/libs/xpcom18a4/python/Makefile.kmk | 97 | ||||
-rwxr-xr-x | src/libs/xpcom18a4/python/gen_python_deps.py | 2 |
3 files changed, 40 insertions, 61 deletions
diff --git a/configure b/configure index 5f5e6dd4f3d..4b69712cd6e 100755 --- a/configure +++ b/configure @@ -2173,7 +2173,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.8m python3.9 python3.9m python3.10 python3.10m" + 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" 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/Makefile.kmk b/src/libs/xpcom18a4/python/Makefile.kmk index b24013f6c08..a3ecd70128c 100644 --- a/src/libs/xpcom18a4/python/Makefile.kmk +++ b/src/libs/xpcom18a4/python/Makefile.kmk @@ -551,7 +551,7 @@ ifndef VBOX_ONLY_SDK ifdef VBOX_PYTHON38_INC # - # Python 3.8 version + # Python 3.8 version (implicitly with pymalloc) # DLLS += VBoxPython3_8 VBoxPython3_8_EXTENDS = VBoxPythonBase @@ -570,30 +570,9 @@ ifndef VBOX_ONLY_SDK endif endif - ifdef VBOX_PYTHON38M_INC - # - # Python 3.8 version with pymalloc - # - DLLS += VBoxPython3_8m - VBoxPython3_8m_EXTENDS = VBoxPythonBase_m - VBoxPython3_8m_EXTENDS_BY = appending - VBoxPython3_8m_INCS = $(VBOX_PYTHON38M_INC) - VBoxPython3_8m_LIBS = $(VBOX_PYTHON38M_LIB) - - ifdef VBOX_WITH_32_ON_64_MAIN_API - ifdef VBOX_PYTHON38M_LIB_X86 - DLLS += VBoxPython3_8m_x86 - VBoxPython3_8m_x86_EXTENDS = VBoxPythonBase_x86_m - VBoxPython3_8m_x86_EXTENDS_BY = appending - VBoxPython3_8m_x86_INCS = $(VBOX_PYTHON38M_INC) - VBoxPython3_8m_x86_LIBS = $(VBOX_PYTHON38M_LIB_X86) - endif - endif - endif - ifdef VBOX_PYTHON39_INC # - # Python 3.9 version + # Python 3.9 version (implicitly with pymalloc) # DLLS += VBoxPython3_9 VBoxPython3_9_EXTENDS = VBoxPythonBase @@ -612,30 +591,9 @@ ifndef VBOX_ONLY_SDK endif endif - ifdef VBOX_PYTHON39M_INC - # - # Python 3.9 version with pymalloc - # - DLLS += VBoxPython3_9m - VBoxPython3_9m_EXTENDS = VBoxPythonBase_m - VBoxPython3_9m_EXTENDS_BY = appending - VBoxPython3_9m_INCS = $(VBOX_PYTHON39M_INC) - VBoxPython3_9m_LIBS = $(VBOX_PYTHON39M_LIB) - - ifdef VBOX_WITH_32_ON_64_MAIN_API - ifdef VBOX_PYTHON39M_LIB_X86 - DLLS += VBoxPython3_9m_x86 - VBoxPython3_9m_x86_EXTENDS = VBoxPythonBase_x86_m - VBoxPython3_9m_x86_EXTENDS_BY = appending - VBoxPython3_9m_x86_INCS = $(VBOX_PYTHON39M_INC) - VBoxPython3_9m_x86_LIBS = $(VBOX_PYTHON39M_LIB_X86) - endif - endif - endif - ifdef VBOX_PYTHON310_INC # - # Python 3.10 version + # Python 3.10 version (implicitly with pymalloc) # DLLS += VBoxPython3_10 VBoxPython3_10_EXTENDS = VBoxPythonBase @@ -654,23 +612,44 @@ ifndef VBOX_ONLY_SDK endif endif - ifdef VBOX_PYTHON310M_INC + ifdef VBOX_PYTHON311_INC + # + # Python 3.11 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) + + 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) + endif + endif + endif + + ifdef VBOX_PYTHON312_INC # - # Python 3.10 version with pymalloc + # Python 3.12 version (implicitly with pymalloc) # - DLLS += VBoxPython3_10m - VBoxPython3_10m_EXTENDS = VBoxPythonBase_m - VBoxPython3_10m_EXTENDS_BY = appending - VBoxPython3_10m_INCS = $(VBOX_PYTHON310M_INC) - VBoxPython3_10m_LIBS = $(VBOX_PYTHON310M_LIB) + DLLS += VBoxPython3_12 + VBoxPython3_12_EXTENDS = VBoxPythonBase + VBoxPython3_12_EXTENDS_BY = appending + VBoxPython3_12_INCS = $(VBOX_PYTHON312_INC) + VBoxPython3_12_LIBS = $(VBOX_PYTHON312_LIB) ifdef VBOX_WITH_32_ON_64_MAIN_API - ifdef VBOX_PYTHON310M_LIB_X86 - DLLS += VBoxPython3_10m_x86 - VBoxPython3_10m_x86_EXTENDS = VBoxPythonBase_x86_m - VBoxPython3_10m_x86_EXTENDS_BY = appending - VBoxPython3_10m_x86_INCS = $(VBOX_PYTHON310M_INC) - VBoxPython3_10m_x86_LIBS = $(VBOX_PYTHON310M_LIB_X86) + ifdef VBOX_PYTHON312_LIB_X86 + DLLS += VBoxPython3_12_x86 + VBoxPython3_12_x86_EXTENDS = VBoxPythonBase_x86 + VBoxPython3_12_x86_EXTENDS_BY = appending + VBoxPython3_12_x86_INCS = $(VBOX_PYTHON312_INC) + VBoxPython3_12_x86_LIBS = $(VBOX_PYTHON312_LIB_X86) endif endif endif @@ -717,7 +696,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 38 39 310 34 33 \ + VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 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 diff --git a/src/libs/xpcom18a4/python/gen_python_deps.py b/src/libs/xpcom18a4/python/gen_python_deps.py index c802367103d..12df59f477b 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.8m", "3.9", "3.9m", "3.10", "3.10m", "3.11", "3.11m" ] +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" ] prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] known = {} |