[101907] trunk/dports/emulators/virtualbox/files
royliu at macports.org
royliu at macports.org
Mon Jan 21 10:48:03 PST 2013
Revision: 101907
https://trac.macports.org/changeset/101907
Author: royliu at macports.org
Date: 2013-01-21 10:48:03 -0800 (Mon, 21 Jan 2013)
Log Message:
-----------
virtualbox: fix issue with VMs not being able to start and close ticket #36910
Modified Paths:
--------------
trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff
trunk/dports/emulators/virtualbox/files/patch-build.diff
Modified: trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff 2013-01-21 18:46:44 UTC (rev 101906)
+++ trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff 2013-01-21 18:48:03 UTC (rev 101907)
@@ -1,5 +1,5 @@
---- Config.kmk.orig 2012-08-19 17:42:19.000000000 -0500
-+++ Config.kmk 2012-08-19 17:42:19.000000000 -0500
+--- Config.kmk.orig 2013-01-21 13:27:33.000000000 -0500
++++ Config.kmk 2013-01-21 13:27:33.000000000 -0500
@@ -1907,10 +1907,8 @@
$(error VBox: 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
endif
@@ -13,3 +13,88 @@
VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
TOOL_GCC4MACHO_SUFFIX ?= $(TOOL_GXX4MACHO_SUFFIX)$(HOSTSUFF_EXE)
+--- kBuild/tools/LLVMGCC42MACHO.kmk.orig 2013-01-21 13:27:33.000000000 -0500
++++ kBuild/tools/LLVMGCC42MACHO.kmk 2013-01-21 13:27:33.000000000 -0500
+@@ -1,6 +1,6 @@
+ # $Id: LLVMGCC42MACHO.kmk 2547 2011-11-04 21:58:53Z bird $
+ ## @file
+-# kBuild Tool Config - LLVM GCC v4.2.x targeting Darwin (Mac OS X) Mach-O.
++# kBuild Tool Config - Apple GCC v4.2.x targeting Darwin (Mac OS X) Mach-O.
+ #
+
+ #
+@@ -31,17 +31,22 @@
+ #
+ #
+
+-TOOL_LLVMGCC42MACHO := LLVM GCC v4.2.x targeting Darwin (Mac OS X) Mach-O.
++TOOL_LLVMGCC42MACHO := Apple GCC v4.2.x targeting Darwin (Mac OS X) Mach-O.
+
+ # Tool Specific Properties
+-TOOL_LLVMGCC42MACHO_PREFIX ?= llvm-
+-TOOL_LLVMGCC42MACHO_SUFFIX ?= -4.2$(HOSTSUFF_EXE)
++TOOL_LLVMGCC42MACHO_PREFIX ?=
++TOOL_LLVMGCC42MACHO_SUFFIX ?= -apple-4.2$(HOSTSUFF_EXE)
+ TOOL_LLVMGCC42MACHO_CC ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
+ TOOL_LLVMGCC42MACHO_CXX ?= $(TOOL_LLVMGCC42MACHO_PREFIX)g++$(TOOL_LLVMGCC42MACHO_SUFFIX)
+ TOOL_LLVMGCC42MACHO_OBJC ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
+ TOOL_LLVMGCC42MACHO_OBJCXX ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
+ TOOL_LLVMGCC42MACHO_AS ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
+-TOOL_LLVMGCC42MACHO_LD ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
++#
++# note: this LLVMGCC42MACHO_LD differs from LLVMGCCMACHO, this is because apple-gcc-42
++# require __personality_* symbol which might require by cpp sources processing by this
++# tool set (e.g. filesplitter), this link issue resolve by involving g++ stack.
++#
++TOOL_LLVMGCC42MACHO_LD ?= $(TOOL_LLVMGCC42MACHO_PREFIX)g++$(TOOL_LLVMGCC42MACHO_SUFFIX)
+ TOOL_LLVMGCC42MACHO_LD_SYSMOD ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
+ ifndef TOOL_LLVMGCC42MACHO_LDFLAGS.$(KBUILD_TARGET)
+ TOOL_LLVMGCC42MACHO_LDFLAGS.dll ?= -dynamiclib
+--- kBuild/tools/LLVMGXX42MACHO.kmk.orig 2013-01-21 13:27:33.000000000 -0500
++++ kBuild/tools/LLVMGXX42MACHO.kmk 2013-01-21 13:27:33.000000000 -0500
+@@ -1,6 +1,6 @@
+ # $Id: LLVMGXX42MACHO.kmk 2547 2011-11-04 21:58:53Z bird $
+ ## @file
+-# kBuild Tool Config - LLVM GCC v4.2.x targeting Darwin (Mac OS X) Mach-O, for building C++ code.
++# kBuild Tool Config - Apple GCC v4.2.x targeting Darwin (Mac OS X) Mach-O, for building C++ code.
+ #
+
+ #
+@@ -31,11 +31,11 @@
+ #
+ #
+
+-TOOL_LLVMGXX42MACHO := LLVM GCC v4.2.x targeting Darwin (Mac OS X) Mach-O, for building C++ code.
++TOOL_LLVMGXX42MACHO := Apple GCC v4.2.x targeting Darwin (Mac OS X) Mach-O, for building C++ code.
+
+ # Tool Specific Properties
+-TOOL_LLVMGXX42MACHO_PREFIX ?= llvm-
+-TOOL_LLVMGXX42MACHO_SUFFIX ?= -4.2$(HOSTSUFF_EXE)
++TOOL_LLVMGXX42MACHO_PREFIX ?=
++TOOL_LLVMGXX42MACHO_SUFFIX ?= -apple-4.2$(HOSTSUFF_EXE)
+ TOOL_LLVMGXX42MACHO_CC ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
+ TOOL_LLVMGXX42MACHO_CXX ?= $(TOOL_LLVMGXX42MACHO_PREFIX)g++$(TOOL_LLVMGXX42MACHO_SUFFIX)
+ TOOL_LLVMGXX42MACHO_OBJC ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
+--- src/libs/kStuff/kStuff/kLdr/kLdrModMachO.c.orig 2013-01-21 13:27:34.000000000 -0500
++++ src/libs/kStuff/kStuff/kLdr/kLdrModMachO.c 2013-01-21 13:27:34.000000000 -0500
+@@ -967,6 +967,8 @@
+ }
+
+ case LC_DYSYMTAB:
++ case LC_FUNCTION_STARTS:
++ case LC_DATA_IN_CODE:
+ /** @todo deal with this! */
+ break;
+
+--- src/libs/kStuff/kStuff/include/k/kLdrFmts/mach-o.h.orig 2013-01-21 13:27:34.000000000 -0500
++++ src/libs/kStuff/kStuff/include/k/kLdrFmts/mach-o.h 2013-01-21 13:27:34.000000000 -0500
+@@ -380,7 +380,8 @@
+ #define LC_VERSION_MIN_MACOSX KU32_C(0x24) /**< The image requires the given Mac OS X version. See version_min_command. */
+ #define LC_VERSION_MIN_IPHONEOS KU32_C(0x25) /**< The image requires the given iOS version. See version_min_command. */
+ #define LC_FUNCTION_STARTS KU32_C(0x26) /**< Where to find the compress function start addresses. See linkedit_data_command. */
+-#define LC_DYLD_ENVIRONMENT KU32_C(0x26) /**< Environment variable for the dynamic linker. See dylinker_command. */
++#define LC_DYLD_ENVIRONMENT KU32_C(0x27) /**< Environment variable for the dynamic linker. See dylinker_command. */
++#define LC_DATA_IN_CODE KU32_C(0x29) /** ???? */
+ /** @} */
+
+
Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff 2013-01-21 18:46:44 UTC (rev 101906)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff 2013-01-21 18:48:03 UTC (rev 101907)
@@ -432,6 +432,44 @@
$(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
+--- src/libs/xpcom18a4/Config.kmk.orig 2013-01-21 13:27:34.000000000 -0500
++++ src/libs/xpcom18a4/Config.kmk 2013-01-21 13:27:34.000000000 -0500
+@@ -228,6 +228,7 @@
+ TEMPLATE_XPCOMOSX104_INCS.darwin = $(VBOX_PATH_MACOSX_SDK_10_4)/Developer/Headers/FlatCarbon
+ endif
+
++ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.5)
+ #
+ # Template for building VBoxPython against the Mac OS X 10.5 SDK.
+ # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
+@@ -239,7 +240,9 @@
+ TEMPLATE_XPCOMOSX105_LDFLAGS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS)
+ TEMPLATE_XPCOMOSX105_DEFS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
+ TEMPLATE_XPCOMOSX105_INCS.darwin = $(VBOX_PATH_MACOSX_SDK_10_5)/Developer/Headers/FlatCarbon
++endif
+
++ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.6)
+ #
+ # Template for building VBoxPhython against the Mac OS X 10.6 SDK.
+ # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
+@@ -251,7 +254,9 @@
+ TEMPLATE_XPCOMOSX106_LDFLAGS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS)
+ TEMPLATE_XPCOMOSX106_DEFS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
+ TEMPLATE_XPCOMOSX106_INCS.darwin = $(VBOX_PATH_MACOSX_SDK_10_6)/Developer/Headers/FlatCarbon
++endif
+
++ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.7)
+ #
+ # Template for building VBoxPhython against the Mac OS X 10.7 SDK.
+ # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
+@@ -264,6 +269,7 @@
+ TEMPLATE_XPCOMOSX107_LDFLAGS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS)
+ TEMPLATE_XPCOMOSX107_DEFS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
+ TEMPLATE_XPCOMOSX107_INCS.darwin = $(VBOX_PATH_MACOSX_SDK_10_7)/Developer/Headers/FlatCarbon
++endif
+
+
+ #
--- 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
@@ -34,14 +34,14 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130121/286a5b4f/attachment.html>
More information about the macports-changes
mailing list