Changeset 97826

Timestamp:

Sep 17, 2012, 1:52:04 AM (12 years ago)

Author:

royliu@…

Message:

virtualbox: fix the build process

Location:

trunk/dports/emulators/virtualbox

Files:

• Portfile (modified) (1 diff)
• files/patch-build.diff (modified) (5 diffs)
• files/patch-configure.diff (deleted)

trunk/dports/emulators/virtualbox/Portfile

@@ -60 +60 @@
     patchfiles                  patch-build.diff \
                                 patch-glext.h.diff \
-                                patch-startup.diff \
-                                patch-configure.diff
+                                patch-startup.diff
 
     configure.compiler          gcc-4.2

trunk/dports/emulators/virtualbox/files/patch-build.diff

@@ -290 +290 @@
      else
        log_failure "qt4 not working"
-@@ -2013,19 +1947,49 @@
+@@ -2013,19 +1947,55 @@
    test_header "Darwin version"
    darwin_ver=`uname -r`
@@ -297 +297 @@
 +      darwin_ver="10.8" # Mountain Lion
 +
-+      if { test -d "/Developer/SDKs/MacOSX10.7.sdk"; } then
-+          sdk="/Developer/SDKs/MacOSX10.7.sdk"
++      if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"; } then
++          sdk="`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"
 +      else
 +          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
@@ -308 +308 @@
        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"
+-      CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
++
++      if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"; } then
++          # Developer tools are not bundled in Xcode.app.
++          sdk="`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"
++          CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
++      elif { test -d "`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"; } then
++          # Developer tools are bundled in Xcode.app.
++          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
++          CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
 +      else
-+          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
++          # Developer tools are bundled in Xcode.app and there's no 10.6 SDK; default to 10.7.
++          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
++          CXX_FLAGS="-mmacosx-version-min=10.7 -isysroot $sdk -Wl,-syslibroot,$sdk"
 +      fi
-+
-       CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
        ;;
      10\.*)
@@ -323 +330 @@
 -          sdk=/Developer/SDKs/MacOSX10.5.sdk
 +
-+          if { test -d "/Developer/SDKs/MacOSX10.5.sdk"; } then
-+              sdk="/Developer/SDKs/MacOSX10.5.sdk"
++          if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"; } then
++              sdk="`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"
 +          else
 +              sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk"
@@ -425 +432 @@
 --- src/libs/xpcom18a4/python/Makefile.kmk.orig 2012-08-21 20:52:14.000000000 -0400
 +++ src/libs/xpcom18a4/python/Makefile.kmk      2012-08-21 20:53:59.000000000 -0400
-@@ -33,15 +33,11 @@ ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
-   VBOX_PYTHON25_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.5
+@@ -34,14 +34,14 @@
    VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
   endif
-- if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
+  if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
 -  && (   !defined(VBOX_OSE) \
 -      || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
-+ ifdef VBOX_PATH_MACOSX_SDK_10_6
++  && defined(VBOX_PATH_MACOSX_SDK_10_6)
++  && ("$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
    VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
    VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
   endif
-- if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
+  if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
 -  && (   defined(VBOX_NOT_OSE_LATER_SOMETIME) \
 -      || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
-+ ifdef VBOX_PATH_MACOSX_SDK_10_7
++  && defined(VBOX_PATH_MACOSX_SDK_10_7)
++  && ("$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
    VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
    VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib