[86383] trunk/dports/emulators/virtualbox
royliu at macports.org
royliu at macports.org
Mon Oct 24 19:09:30 PDT 2011
Revision: 86383
http://trac.macports.org/changeset/86383
Author: royliu at macports.org
Date: 2011-10-24 19:09:24 -0700 (Mon, 24 Oct 2011)
Log Message:
-----------
virtualbox: use LLVM when available and close ticket #31734
Modified Paths:
--------------
trunk/dports/emulators/virtualbox/Portfile
trunk/dports/emulators/virtualbox/files/patch-build.diff
trunk/dports/emulators/virtualbox/files/patch-vde.diff
Modified: trunk/dports/emulators/virtualbox/Portfile
===================================================================
--- trunk/dports/emulators/virtualbox/Portfile 2011-10-25 01:12:04 UTC (rev 86382)
+++ trunk/dports/emulators/virtualbox/Portfile 2011-10-25 02:09:24 UTC (rev 86383)
@@ -6,6 +6,7 @@
name virtualbox
version 4.1.4
+revision 1
categories emulators
maintainers nomaintainer
description open source virtualization technology from Oracle
@@ -145,7 +146,8 @@
}
variant vnc description {Enable support for VNC} {
- depends_lib-append port:LibVNCServer
+
+ depends_lib-append path:lib/pkgconfig/libvncserver.pc:LibVNCServer
configure.args-append --enable-vnc
}
Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff 2011-10-25 01:12:04 UTC (rev 86382)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff 2011-10-25 02:09:24 UTC (rev 86383)
@@ -9,6 +9,67 @@
endif
# Keep in sync with G_virtualBoxPackage in glue-jaxws.xsl and glue-java.xsl
+@@ -1781,11 +1781,13 @@ ifeq ($(KBUILD_TARGET),darwin)
+ 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_PREFIX ?= llvm-
++ VBOX_MACOSX_GCC_SUFFIX ?= -4.2
+ else
+ VBOX_DEF_MACOSX_VERSION_MIN ?= 10.5
+ VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= $(VBOX_LD_no_compact_linkedit)
+- VBOX_MACOSX_GCC_INFIX ?= -4.0
++ VBOX_MACOSX_GCC_PREFIX ?= llvm-
++ VBOX_MACOSX_GCC_SUFFIX ?= -4.0
+ endif
+ else
+ if $(VBOX_XCODE_VERSION_MAJOR) >= 4
+@@ -1793,28 +1795,30 @@ ifeq ($(KBUILD_TARGET),darwin)
+ endif
+ VBOX_DEF_MACOSX_VERSION_MIN ?= 10.4
+ VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
+- VBOX_MACOSX_GCC_INFIX ?= -4.0
++ VBOX_MACOSX_GCC_PREFIX ?=
++ VBOX_MACOSX_GCC_SUFFIX ?= -4.0
+ endif
+ else
+ if $(VBOX_XCODE_VERSION_MAJOR) < 4 && "$(VBOX_XCODE_VERSION)" != "3.2"
+ $(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_PREFIX ?= llvm-
++ VBOX_MACOSX_GCC_SUFFIX ?= -4.2
+ VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
+ endif
+- TOOL_GCC4MACHO_CC = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- TOOL_GCC4MACHO_CXX = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- TOOL_GCC4MACHO_AS = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- TOOL_GCC4MACHO_LD = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- TOOL_GCC4MACHO_LD_SYSMOD = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- TOOL_GXX4MACHO_CC = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- TOOL_GXX4MACHO_CXX = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- TOOL_GXX4MACHO_OBJC= gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden
+- TOOL_GXX4MACHO_OBJCXX = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden -fvisibility-inlines-hidden
+- TOOL_GXX4MACHO_AS = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- TOOL_GXX4MACHO_LD = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- TOOL_GXX4MACHO_LD_SYSMOD = g++$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
++ TOOL_GCC4MACHO_CC = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
++ TOOL_GCC4MACHO_CXX = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
++ TOOL_GCC4MACHO_AS = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
++ TOOL_GCC4MACHO_LD = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
++ TOOL_GCC4MACHO_LD_SYSMOD = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
++ TOOL_GXX4MACHO_CC = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
++ TOOL_GXX4MACHO_CXX = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
++ TOOL_GXX4MACHO_OBJC= $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden
++ TOOL_GXX4MACHO_OBJCXX = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE) $(if-expr $(KBUILD_TARGET_ARCH) == "x86",-m32,-m64) -fvisibility=hidden -fvisibility-inlines-hidden
++ TOOL_GXX4MACHO_AS = $(VBOX_MACOSX_GCC_PREFIX)gcc$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
++ TOOL_GXX4MACHO_LD = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
++ TOOL_GXX4MACHO_LD_SYSMOD = $(VBOX_MACOSX_GCC_PREFIX)g++$(VBOX_MACOSX_GCC_SUFFIX)$(HOSTSUFF_EXE)
+ ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
+ ifeq ($(origin VBOX_DARWIN_CLASSIC_LINKER),undefined)
+ VBOX_DARWIN_CLASSIC_LINKER := $(shell ld -v 2>&1 )
@@ -2063,22 +2063,22 @@
VBOX_GCC32_CHECK_CXX = $(2)
else
@@ -141,6 +202,15 @@
CXX32=""
CXX64=""
BCC="bcc"
+@@ -995,6 +995,8 @@
+ }
+ }
+ EOF
++ INCVNCSERVER=`pkg-config libvncserver --cflags`
++ LIBVNCSERVER=`pkg-config libvncserver --libs`
+ if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then
+ if test_execute; then
+ cnf_append "VBOX_WITH_VNC" "1"
@@ -1100,21 +1100,6 @@
check_sdl()
{
Modified: trunk/dports/emulators/virtualbox/files/patch-vde.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-vde.diff 2011-10-25 01:12:04 UTC (rev 86382)
+++ trunk/dports/emulators/virtualbox/files/patch-vde.diff 2011-10-25 02:09:24 UTC (rev 86383)
@@ -1,6 +1,6 @@
--- configure.orig 2011-08-15 19:38:16.000000000 -0500
+++ configure 2011-08-15 19:38:16.000000000 -0500
-@@ -2553,7 +2553,7 @@
+@@ -2555,7 +2555,7 @@
fi
# VDE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111024/8250b5bb/attachment.html>
More information about the macports-changes
mailing list