[93203] trunk/dports/emulators/virtualbox/files

[royliu at macports.org]

Revision: 93203
          https://trac.macports.org/changeset/93203
Author:   royliu at macports.org
Date:     2012-05-17 12:10:20 -0700 (Thu, 17 May 2012)
Log Message:
-----------
virtualbox: fix the build process

Modified Paths:
--------------
    trunk/dports/emulators/virtualbox/files/patch-build.diff
    trunk/dports/emulators/virtualbox/files/patch-vde.diff

Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff	2012-05-17 18:36:19 UTC (rev 93202)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff	2012-05-17 19:10:20 UTC (rev 93203)
@@ -24,6 +24,21 @@
   endif
   VBOX_DARWIN_DEF_SDK_DEFS        := MAC_OS_X_VERSION_MIN_REQUIRED=$(subst .,,$(VBOX_DEF_MACOSX_VERSION_MIN))0 \
                                      MAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(VBOX_DEF_MACOSX_VERSION_MIN))0
+@@ -1869,7 +1875,13 @@
+  endif
+ 
+  if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.4 10.5 10.6)
+-  VBOX_PATH_MACOSX_SDK_10_6            ?= /Developer/SDKs/MacOSX10.6.sdk
++  ifndef VBOX_PATH_MACOSX_SDK_10_6
++   ifneq ($(wildcard /Developer/SDKs/MacOSX10.6.sdk),)
++    VBOX_PATH_MACOSX_SDK_10_6           = /Developer/SDKs/MacOSX10.6.sdk
++   else
++    VBOX_PATH_MACOSX_SDK_10_6           = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
++   endif
++  endif
+   VBOX_DARWIN_DEF_SDK_10_6_DEFS        := MAC_OS_X_VERSION_MIN_REQUIRED=1060 MAC_OS_X_VERSION_MAX_ALLOWED=1060
+   VBOX_DARWIN_DEF_SDK_10_6_CFLAGS      := -mmacosx-version-min=10.6 -isysroot $(VBOX_PATH_MACOSX_SDK_10_6)
+   VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS    := -mmacosx-version-min=10.6 -isysroot $(VBOX_PATH_MACOSX_SDK_10_6)
 @@ -1887,7 +1899,7 @@
     ifneq ($(wildcard /Developer/SDKs/MacOSX10.7.sdk),)
      VBOX_PATH_MACOSX_SDK_10_7           = /Developer/SDKs/MacOSX10.7.sdk
@@ -274,6 +289,46 @@
        fi
      else
        log_failure "qt4 not working"
+@@ -2015,17 +1949,36 @@
+   case "$darwin_ver" in
+     11\.*)
+       darwin_ver="10.7" # Lion
+-      sdk=/Developer/SDKs/MacOSX10.6.sdk
++
++      if { test -d "/Developer/SDKs/MacOSX10.6.sdk"; } then
++          sdk="/Developer/SDKs/MacOSX10.6.sdk"
++      else
++          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
++      fi
++
+       CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
+       ;;
+     10\.*)
+       darwin_ver="10.6" # Snow Leopard
++
+       if [ "$BUILD_MACHINE" = "x86" ]; then
+-          sdk=/Developer/SDKs/MacOSX10.5.sdk
++
++          if { test -d "/Developer/SDKs/MacOSX10.5.sdk"; } then
++              sdk="/Developer/SDKs/MacOSX10.5.sdk"
++          else
++              sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk"
++          fi
++
+           CXX_FLAGS="-mmacosx-version-min=10.5 -isysroot $sdk -Wl,-syslibroot,$sdk"
+           cnf_append "VBOX_MACOS_10_5_WORKAROUND" "1"
+       else
+-          sdk=/Developer/SDKs/MacOSX10.6.sdk
++
++          if { test -d "/Developer/SDKs/MacOSX10.6.sdk"; } then
++              sdk="/Developer/SDKs/MacOSX10.6.sdk"
++          else
++              sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
++          fi
++
+           CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
+       fi
+ #      test "$CC" = "gcc" && CC="gcc-4.0"
 @@ -2220,7 +2152,7 @@
      --with-openssl-dir=*)
        OPENSSLDIR=`echo $option | cut -d'=' -f2`

Modified: trunk/dports/emulators/virtualbox/files/patch-vde.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-vde.diff	2012-05-17 18:36:19 UTC (rev 93202)
+++ trunk/dports/emulators/virtualbox/files/patch-vde.diff	2012-05-17 19:10:20 UTC (rev 93203)
@@ -1,6 +1,6 @@
 --- configure.orig	2011-08-15 19:38:16.000000000 -0500
 +++ configure	2011-08-15 19:38:16.000000000 -0500
-@@ -2502,7 +2502,7 @@
+@@ -2521,7 +2521,7 @@
  fi
  
  # VDE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120517/4a5a8a45/attachment.html>