Changeset 99005 in vbox for trunk

Timestamp:

Mar 16, 2023 12:46:15 PM (21 months ago)

Author:

vboxsync

Message:

xpcom,Installer/darwin: Build and ship the version agnostic VBoxPython3 module on macOS, bugref:9790 [another try, mac2 has python 3.7 instead of 3.8]

Location:

trunk/src

Files:

• VBox/Installer/darwin/Makefile.kmk (modified) (1 diff)
• libs/xpcom18a4/python/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -479 +479 @@
         MacOS/VBoxPython2_7.so
 endif
-if defined(VBOX_WITH_PYTHON) && !defined(VBOX_WITHOUT_PYTHON_LIMITED_API) && $(KBUILD_TARGET_ARCH) == "arm64"
+if    defined(VBOX_WITH_PYTHON) \
+   && !defined(VBOX_WITHOUT_PYTHON_LIMITED_API) \
+   && exists "$(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/VBoxPython3.so"
  VBOX_DI_VBAPP_DYLIBS += \
         MacOS/VBoxPython3.so

trunk/src/libs/xpcom18a4/python/Makefile.kmk

@@ -79 +79 @@
  # For now we will only provide the module for 3.8 and the version agnostic variant using the limited API.
  #
- if1of ($(KBUILD_TARGET_ARCH),arm64) # @todo Doesn't work on the mac2 build boxes
+ if exists "/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.8"
   VBOX_PYTHON38_INC = /Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.8/Headers
   VBOX_PYTHON38_LIB = /Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.8/lib/libpython3.8.dylib
+ endif
+ if exists "/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.7"
+  VBOX_PYTHON37_INC = /Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.7/Headers
+  VBOX_PYTHON37_LIB = /Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.7/lib/libpython3.8.dylib
  endif