diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/libs/xpcom18a4/python/Makefile.kmk | 48 |
2 files changed, 48 insertions, 2 deletions
diff --git a/configure b/configure index 0f8faa1c114..a61da05663a 100755 --- a/configure +++ b/configure @@ -2041,7 +2041,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" + 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" 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 d524bd97367..23272feb0d7 100644 --- a/src/libs/xpcom18a4/python/Makefile.kmk +++ b/src/libs/xpcom18a4/python/Makefile.kmk @@ -20,7 +20,7 @@ include $(KBUILD_PATH)/subheader.kmk # # List of supported Python versions, defining a number of -# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|DEF]_[INC|LIB] variables +# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB] variables # which get picked up below. # ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script. @@ -600,6 +600,52 @@ VBoxPython3_8m_x86_LIBS = $(VBOX_PYTHON38M_LIB_X86) endif endif +ifdef VBOX_PYTHON39_INC +# +# Python 3.9 version +# +DLLS += VBoxPython3_9 +VBoxPython3_9_EXTENDS = VBoxPythonBase +VBoxPython3_9_EXTENDS_BY = appending +VBoxPython3_9_TEMPLATE = XPCOM +VBoxPython3_9_INCS = $(VBOX_PYTHON39_INC) +VBoxPython3_9_LIBS = $(VBOX_PYTHON39_LIB) + + ifdef VBOX_WITH_32_ON_64_MAIN_API + ifdef VBOX_PYTHON39_LIB_X86 +DLLS += VBoxPython3_9_x86 +VBoxPython3_9_x86_EXTENDS = VBoxPythonBase_x86 +VBoxPython3_9_x86_EXTENDS_BY = appending +VBoxPython3_9_x86_TEMPLATE = XPCOM +VBoxPython3_9_x86_INCS = $(VBOX_PYTHON39_INC) +VBoxPython3_9_x86_LIBS = $(VBOX_PYTHON39_LIB_X86) + endif + 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_TEMPLATE = XPCOM +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_TEMPLATE_ = XPCOM +VBoxPython3_9m_x86_INCS = $(VBOX_PYTHON39M_INC) +VBoxPython3_9m_x86_LIBS = $(VBOX_PYTHON39M_LIB_X86) + endif + endif +endif + ifdef VBOX_PYTHONDEF_INC # # Python without versioning |