Changeset 85061 in vbox for trunk/src

Timestamp:

Jul 6, 2020 9:31:10 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138964

Message:

xpcom18a4/python: Adjustments for newer Xcode versions. bugref:9790

File:

• trunk/src/libs/xpcom18a4/python/Makefile.kmk (modified) (6 diffs)

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

@@ -38 +38 @@
    VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Headers
    VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Python
-  else
+  else if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.6 10.7 10.8 10.9 10.10 10.11 10.12) ## @todo @bugref{9790} 2.6 header was dropped in 10.13, so: else if $(VBOX_DEF_MACOSX_VERSION_MIN) vge 10.13
    VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Headers
    VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Python
@@ -73 +73 @@
  $(eval $(subst |,$(NL),$(shell $(VBOX_BLD_PYTHON) \
         $(PATH_SUB_CURRENT)/gen_python_deps.py \
-            $(KBUILD_TARGET) \
-            $(KBUILD_TARGET_ARCH) \
-            $(VBOX_MULTIPYTHON) )))
+        $(KBUILD_TARGET) \
+        $(KBUILD_TARGET_ARCH) \
+        $(VBOX_MULTIPYTHON) )))
 endif
 
@@ -149 +149 @@
 VBoxPython2_6_EXTENDS    = VBoxPythonBase
 VBoxPython2_6_EXTENDS_BY = appending
+ ifdef KMK_WITH_VERSION_COMPARE
+VBoxPython2_6_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,)
+ else
 VBoxPython2_6_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,)
+ endif
 VBoxPython2_6_INCS       = $(VBOX_PYTHON26_INC)
 VBoxPython2_6_LIBS       = $(VBOX_PYTHON26_LIB)
@@ -158 +162 @@
 VBoxPython2_6_x86_EXTENDS    = VBoxPythonBase_x86
 VBoxPython2_6_x86_EXTENDS_BY = appending
+   ifdef KMK_WITH_VERSION_COMPARE
+VBoxPython2_6_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,-x86)
+   else
 VBoxPython2_6_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,-x86)
+   endif
 VBoxPython2_6_x86_INCS       = $(VBOX_PYTHON26_INC)
 VBoxPython2_6_x86_LIBS       = $(VBOX_PYTHON26_LIB_X86)
@@ -172 +180 @@
 VBoxPython2_7_EXTENDS    = VBoxPythonBase
 VBoxPython2_7_EXTENDS_BY = appending
+ ifdef KMK_WITH_VERSION_COMPARE
+VBoxPython2_7_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,)
+ else
 VBoxPython2_7_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7",OSX107,)
+ endif
 VBoxPython2_7_INCS       = $(VBOX_PYTHON27_INC)
 VBoxPython2_7_LIBS       = $(VBOX_PYTHON27_LIB)
@@ -181 +193 @@
 VBoxPython2_7_x86_EXTENDS    = VBoxPythonBase_x86
 VBoxPython2_7_x86_EXTENDS_BY = appending
+   ifdef KMK_WITH_VERSION_COMPARE
+VBoxPython2_7_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,-x86)
+   else
 VBoxPython2_7_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7",OSX107,-x86)
+   endif
 VBoxPython2_7_x86_INCS       = $(VBOX_PYTHON27_INC)
 VBoxPython2_7_x86_LIBS       = $(VBOX_PYTHON27_LIB_X86)