[89084] trunk/dports/emulators/virtualbox

[royliu at macports.org]

Revision: 89084
          http://trac.macports.org/changeset/89084
Author:   royliu at macports.org
Date:     2012-01-18 21:31:37 -0800 (Wed, 18 Jan 2012)
Log Message:
-----------
virtualbox: fix build for Xcode 3.2.6 and close ticket #32711

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

Added Paths:
-----------
    trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff

Modified: trunk/dports/emulators/virtualbox/Portfile
===================================================================
--- trunk/dports/emulators/virtualbox/Portfile	2012-01-19 05:24:00 UTC (rev 89083)
+++ trunk/dports/emulators/virtualbox/Portfile	2012-01-19 05:31:37 UTC (rev 89084)
@@ -59,6 +59,7 @@
 if {![file executable ${configure.cc}]} {
 
     depends_build-append    port:apple-gcc42
+    patchfiles-append       patch-apple-gcc42.diff
     configure.compiler      apple-gcc-4.2
     # Set this explicitly because non-trunk versions of MacPorts don't.
     configure.cxx           ${prefix}/bin/g++-apple-4.2

Added: trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff	                        (rev 0)
+++ trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff	2012-01-19 05:31:37 UTC (rev 89084)
@@ -0,0 +1,20 @@
+--- Config.kmk.orig	2011-08-15 19:38:16.000000000 -0500
++++ Config.kmk	2011-08-15 19:38:16.000000000 -0500
+@@ -1781,7 +1781,7 @@
+    if "$(VBOX_XCODE_VERSION_MAJOR)" == "4"
+     VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
+     VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
+-    VBOX_MACOSX_GCC_INFIX ?= -4.2
++    VBOX_MACOSX_GCC_INFIX ?= -apple-4.2
+    else
+     VBOX_DEF_MACOSX_VERSION_MIN ?= 10.5
+     VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= $(VBOX_LD_no_compact_linkedit)
+@@ -1800,7 +1802,7 @@
+    $(error 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
+   endif
+   VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
+-  VBOX_MACOSX_GCC_INFIX ?= -4.2
++  VBOX_MACOSX_GCC_INFIX ?= -apple-4.2
+   VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
+  endif
+  TOOL_GCC4MACHO_CC  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)

Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff	2012-01-19 05:24:00 UTC (rev 89083)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff	2012-01-19 05:31:37 UTC (rev 89084)
@@ -9,24 +9,6 @@
  endif
  
  # Keep in sync with G_virtualBoxPackage in glue-jaxws.xsl and glue-java.xsl
-@@ -1781,7 +1781,7 @@
-    if "$(VBOX_XCODE_VERSION_MAJOR)" == "4"
-     VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
-     VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
--    VBOX_MACOSX_GCC_INFIX ?= -4.2
-+    VBOX_MACOSX_GCC_INFIX ?= -apple-4.2
-    else
-     VBOX_DEF_MACOSX_VERSION_MIN ?= 10.5
-     VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= $(VBOX_LD_no_compact_linkedit)
-@@ -1800,7 +1802,7 @@
-    $(error 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
-   endif
-   VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
--  VBOX_MACOSX_GCC_INFIX ?= -4.2
-+  VBOX_MACOSX_GCC_INFIX ?= -apple-4.2
-   VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
-  endif
-  TOOL_GCC4MACHO_CC  = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
 @@ -2063,22 +2063,22 @@
  VBOX_GCC32_CHECK_CXX = $(2)
  else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120118/f0074e52/attachment.html>