VirtualBox

Changeset 85061 in vbox for trunk/src


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libs/xpcom18a4/python/Makefile.kmk

    r82395 r85061  
    3838   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Headers
    3939   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Python
    40   else
     40  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
    4141   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Headers
    4242   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Python
     
    7373 $(eval $(subst |,$(NL),$(shell $(VBOX_BLD_PYTHON) \
    7474        $(PATH_SUB_CURRENT)/gen_python_deps.py \
    75             $(KBUILD_TARGET) \
    76             $(KBUILD_TARGET_ARCH) \
    77             $(VBOX_MULTIPYTHON) )))
     75        $(KBUILD_TARGET) \
     76        $(KBUILD_TARGET_ARCH) \
     77        $(VBOX_MULTIPYTHON) )))
    7878endif
    7979
     
    149149VBoxPython2_6_EXTENDS    = VBoxPythonBase
    150150VBoxPython2_6_EXTENDS_BY = appending
     151 ifdef KMK_WITH_VERSION_COMPARE
     152VBoxPython2_6_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,)
     153 else
    151154VBoxPython2_6_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,)
     155 endif
    152156VBoxPython2_6_INCS       = $(VBOX_PYTHON26_INC)
    153157VBoxPython2_6_LIBS       = $(VBOX_PYTHON26_LIB)
     
    158162VBoxPython2_6_x86_EXTENDS    = VBoxPythonBase_x86
    159163VBoxPython2_6_x86_EXTENDS_BY = appending
     164   ifdef KMK_WITH_VERSION_COMPARE
     165VBoxPython2_6_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,-x86)
     166   else
    160167VBoxPython2_6_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,-x86)
     168   endif
    161169VBoxPython2_6_x86_INCS       = $(VBOX_PYTHON26_INC)
    162170VBoxPython2_6_x86_LIBS       = $(VBOX_PYTHON26_LIB_X86)
     
    172180VBoxPython2_7_EXTENDS    = VBoxPythonBase
    173181VBoxPython2_7_EXTENDS_BY = appending
     182 ifdef KMK_WITH_VERSION_COMPARE
     183VBoxPython2_7_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,)
     184 else
    174185VBoxPython2_7_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7",OSX107,)
     186 endif
    175187VBoxPython2_7_INCS       = $(VBOX_PYTHON27_INC)
    176188VBoxPython2_7_LIBS       = $(VBOX_PYTHON27_LIB)
     
    181193VBoxPython2_7_x86_EXTENDS    = VBoxPythonBase_x86
    182194VBoxPython2_7_x86_EXTENDS_BY = appending
     195   ifdef KMK_WITH_VERSION_COMPARE
     196VBoxPython2_7_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,-x86)
     197   else
    183198VBoxPython2_7_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7",OSX107,-x86)
     199   endif
    184200VBoxPython2_7_x86_INCS       = $(VBOX_PYTHON27_INC)
    185201VBoxPython2_7_x86_LIBS       = $(VBOX_PYTHON27_LIB_X86)
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette