Ticket #40223: patch-emulators-virtualbox-osx10.6.diff

File patch-emulators-virtualbox-osx10.6.diff, 2.9 KB (added by pixilla (Bradley Giesbrecht), 11 years ago)
  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/emulators/virtualbox/files/patch-build.diff

     
    432432 $(eval $(target)_DEFS      += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
    433433 
    434434 
    435 --- src/libs/xpcom18a4/Config.kmk.orig  2013-01-21 13:27:34.000000000 -0500
    436 +++ src/libs/xpcom18a4/Config.kmk   2013-01-21 13:27:34.000000000 -0500
    437 @@ -228,6 +228,7 @@
    438   TEMPLATE_XPCOMOSX104_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_4)/Developer/Headers/FlatCarbon
    439  endif
    440  
    441 +ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.5)
    442  #
    443  # Template for building VBoxPython against the Mac OS X 10.5 SDK.
    444  # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
    445 @@ -239,7 +240,9 @@
    446  TEMPLATE_XPCOMOSX105_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS)
    447  TEMPLATE_XPCOMOSX105_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
    448  TEMPLATE_XPCOMOSX105_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_5)/Developer/Headers/FlatCarbon
    449 +endif
    450  
    451 +ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.6)
    452  #
    453  # Template for building VBoxPhython against the Mac OS X 10.6 SDK.
    454  # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
    455 @@ -251,7 +254,9 @@
    456  TEMPLATE_XPCOMOSX106_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS)
    457  TEMPLATE_XPCOMOSX106_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
    458  TEMPLATE_XPCOMOSX106_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_6)/Developer/Headers/FlatCarbon
    459 +endif
    460  
    461 +ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.7)
    462  #
    463  # Template for building VBoxPhython against the Mac OS X 10.7 SDK.
    464  # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
    465 @@ -264,6 +269,7 @@
    466  TEMPLATE_XPCOMOSX107_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS)
    467  TEMPLATE_XPCOMOSX107_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
    468  TEMPLATE_XPCOMOSX107_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_7)/Developer/Headers/FlatCarbon
    469 +endif
    470  
    471  
    472  #
    473435--- src/libs/xpcom18a4/python/Makefile.kmk.orig 2012-08-21 20:52:14.000000000 -0400
    474436+++ src/libs/xpcom18a4/python/Makefile.kmk      2012-08-21 20:53:59.000000000 -0400
    475437@@ -34,14 +34,14 @@