diff -Naur VirtualBox-4.0.0_OSE/AutoConfig.kmk VirtualBox-4.0.0_OSE.new/AutoConfig.kmk --- VirtualBox-4.0.0_OSE/AutoConfig.kmk 1970-01-01 01:00:00.000000000 +0100 +++ VirtualBox-4.0.0_OSE.new/AutoConfig.kmk 2011-01-09 04:01:11.000000000 +0100 @@ -0,0 +1,40 @@ +# -*- Makefile -*- +# +# automatically generated by +# +# './configure --disable-hardening --disable-docs --with-openssl-dir=/opt/local' +# +# It will be completely overwritten if configure is executed again. +# + +VBOX_OSE := 1 +VBOX_WITH_TESTSUITE := +VBOX_WITH_WIN32_ADDITIONS := +VBOX_WITH_LINUX_ADDITIONS := + +VBOX_WITH_SECURELABEL := +VBOX_WITHOUT_HARDENING := 1 +VBOX_MACOS_10_5_WORKAROUND := 1 +TOOL_GCC32_CC := gcc +TOOL_GCC32_AS := gcc +TOOL_GCC32_LD := gcc +TOOL_GXX32_CC := gcc +TOOL_GXX32_AS := gcc +TOOL_GCC32_CXX := g++ +TOOL_GXX32_CXX := g++ +TOOL_GXX32_LD := g++ +VBOX_LIBIDL_CONFIG := PKG_CONFIG_PATH=/opt/local/lib/pkgconfig /opt/local/bin/libIDL-config-2 +SDK_VBOX_OPENSSL_INCS := /opt/local/include +SDK_VBOX_OPENSSL_LIBS := /opt/local/lib/libcrypto.a +SDK_VBOX_BLD_OPENSSL_LIBS := /opt/local/lib/libcrypto.a +SDK_VBOX_LIBCURL_LIBS := curl +SDK_VBOX_LIBCURL_INCS := +VBOX_WITH_CROGL := 1 +VBOX_PATH_QT4_LIB := /opt/local/lib +SDK_QT4_LIBPATH := /opt/local/lib +PATH_SDK_QT4_INC := /opt/local/include +PATH_SDK_QT4_LIB := /opt/local/lib +VBOX_WITH_PYTHON := 1 +VBOX_WITH_WEBSERVICES := +VBOX_WITH_DOCS := +VBOX_WITH_DOCS_PACKING := diff -Naur VirtualBox-4.0.0_OSE/Config.kmk VirtualBox-4.0.0_OSE.new/Config.kmk --- VirtualBox-4.0.0_OSE/Config.kmk 2010-12-22 15:00:25.000000000 +0100 +++ VirtualBox-4.0.0_OSE.new/Config.kmk 2011-01-09 04:17:52.000000000 +0100 @@ -584,7 +584,7 @@ if1of ($(KBUILD_TARGET), linux solaris) VBOX_PATH_APP_PRIVATE = /opt/VirtualBox else ifeq ($(KBUILD_TARGET),darwin) - VBOX_PATH_APP_PRIVATE = /Applications/VirtualBox.app/Contents/MacOS + VBOX_PATH_APP_PRIVATE = /Applications/Utilities/VirtualBox.app/Contents/MacOS else ifeq ($(KBUILD_TARGET),freebsd) VBOX_PATH_APP_PRIVATE = /usr/local/lib/virtualbox endif @@ -3735,25 +3735,6 @@ # be cleaned up properly later some time (not important now). # ifeq ($(VBOX_PATH_QT4),) - ifeq ($(KBUILD_TARGET),darwin) - VBOX_PATH_QT4 := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))) - ifeq ($(VBOX_PATH_QT4),) - ifneq ($(wildcard /Library/Frameworks/QtCore.framework),) - # Using the global installation (for OSE). - VBOX_PATH_QT4 ?= /usr - VBOX_PATH_QT4_FRAMEWORKS ?= /Library/Frameworks - endif - endif - else if1of ($(KBUILD_TARGET), win) - VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))) - else if1of ($(KBUILD_TARGET), solaris) - VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))) - ifneq ($(VBOX_PATH_QT4),) - VBOX_WITH_QT4_SUN = 1 - endif - endif - endif - ifeq ($(VBOX_PATH_QT4),) if1of ($(USERNAME), bird) # gentoo (64-bit) VBOX_PATH_QT4 ?= /usr diff -Naur VirtualBox-4.0.0_OSE/LocalConfig.kmk VirtualBox-4.0.0_OSE.new/LocalConfig.kmk --- VirtualBox-4.0.0_OSE/LocalConfig.kmk 1970-01-01 01:00:00.000000000 +0100 +++ VirtualBox-4.0.0_OSE.new/LocalConfig.kmk 2011-01-09 01:37:35.000000000 +0100 @@ -0,0 +1,3 @@ +VBOX_DEF_MACOSX_VERSION_MIN = 10.6 +VBOX_DARWIN_NO_COMPACT_LINKEDIT = +VBOX_MACOS_10_5_WORKAROUND = diff -Naur VirtualBox-4.0.0_OSE/Makefile.kmk VirtualBox-4.0.0_OSE.new/Makefile.kmk --- VirtualBox-4.0.0_OSE/Makefile.kmk 2010-12-09 21:41:52.000000000 +0100 +++ VirtualBox-4.0.0_OSE.new/Makefile.kmk 2011-01-09 04:34:59.000000000 +0100 @@ -182,47 +182,6 @@ # Install our Qt DLLs / Shared Objects / Frameworks. # Note: The installer fixes the darwin .dylibs when hardening is enabled. # -ifeq ($(KBUILD_TARGET),darwin) - INSTALLS += qt4-bin - qt4-bin_MODE = 755 - qt4-bin_INST = $(INST_VIRTUALBOX)Contents/ - qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT4_MOD_NAMES) \ - ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod)) - ifdef VBOX_WITH_COCOA_QT - qt4-bin_SOURCES += \ - $(PATH_SDK_QT4_LIB)/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/classes.nib=>Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/classes.nib \ - $(PATH_SDK_QT4_LIB)/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/info.nib=>Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/info.nib \ - $(PATH_SDK_QT4_LIB)/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib=>Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib - endif - ifneq ($(wildcard $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib),) - qt4-bin_SOURCES += \ - $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib - endif - qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \ - ,Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod)) - ifdef VBOX_WITH_COCOA_QT - qt4-bin_SYMLINKS += \ - Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Resources=>Versions/4/Resources/ - endif -else - ifdef VBOX_WITH_QT4_SUN - ifeq ($(KBUILD_TARGET),win) - INSTALLS += qt4-bin - qt4-bin_MODE = 755 - qt4-bin_INST = $(INST_BIN) - qt4-bin_SOURCES = \ - $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT4_LIB)/$(qtmod)4$(SUFF_DLL)) \ - $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL)=>accessible/qtaccessiblewidgets4$(SUFF_DLL) - else - INSTALLS += qt4-bin - qt4-bin_MODE = 755 - qt4-bin_INST = $(INST_BIN) - qt4-bin_SOURCES = \ - $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT4_LIB)/lib$(qtmod)$(SUFF_DLL).4) \ - $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL) - endif - endif # VBOX_WITH_QT4_SUN -endif # diff -Naur VirtualBox-4.0.0_OSE/configure VirtualBox-4.0.0_OSE.new/configure --- VirtualBox-4.0.0_OSE/configure 2010-12-05 19:17:42.000000000 +0100 +++ VirtualBox-4.0.0_OSE.new/configure 2011-01-09 03:54:29.000000000 +0100 @@ -1424,53 +1424,23 @@ { foundqt4= test_header Qt4 - if [ "$OS" = "darwin" ]; then - # First check if there is the internal version of Qt. If yes nothing else - # has to be done. - QT_INTERNAL=`/bin/ls -rd1 $PWD/tools/$BUILD_TARGET.$BUILD_PLATFORM_ARCH/qt/* 2> /dev/null` - for t in $QT_INTERNAL; do - if [ -f "$t/Frameworks/QtCoreVBox.framework/QtCoreVBox" ]; then - cnf_append "VBOX_WITH_QT4_SUN" "1" - log_success "use internal version" - return - fi - done - # Now try the user provided directory and some of the standard directories. - QT_TRIES="$QT4DIR /System/Library /Library" - for t in $QT_TRIES; do - if [ -f "$t/Frameworks/QtCore.framework/QtCore" ]; then - PATH_SDK_QT4="$t" - break - fi - done - # Add the necessary params for building the test application - if [ -n "$PATH_SDK_QT4" ]; then - foundqt4=1 - INCQT4=-I$PATH_SDK_QT4/Frameworks/QtCore.framework/Headers - LIBQT4=-F$PATH_SDK_QT4/Frameworks - FLGQT4="-framework QtCore" - else - log_failure "Qt4 framework not found (can be disabled using --disable-qt4)" - fail - fi - else if [ $QT4DIR_PKGCONFIG -eq 1 ]; then # default is to use pkg-config if which_wrapper pkg-config > /dev/null; then # this braindead path is necessary for mdv2008.1 qt4_ver=`\ - PKG_CONFIG_PATH=/usr/lib/qt4/lib/pkgconfig \ + PKG_CONFIG_PATH=/opt/local/lib/pkgconfig \ pkg-config QtCore --modversion 2>> $LOG` if [ $? -ne 0 ]; then log_failure "QtCore not found" fail else FLGQT4=`\ - PKG_CONFIG_PATH=/usr/lib/qt4/lib/pkgconfig \ + PKG_CONFIG_PATH=/opt/local/lib/pkgconfig \ pkg-config QtCore --cflags` INCQT4=`strip_I "$FLGQT4"` LIBQT4=`\ - PKG_CONFIG_PATH=/usr/lib/qt4/lib/pkgconfig \ + PKG_CONFIG_PATH=/opt/local/lib/pkgconfig \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ pkg-config QtCore --libs` foundqt4=1 @@ -1512,7 +1482,6 @@ fi done fi - fi if [ -n "$foundqt4" ]; then cat > $ODIR.tmp_src.cc << EOF #include @@ -1532,21 +1501,6 @@ [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"` if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then if test_execute_path "`strip_L "$LIBQT4"`"; then - if [ "$OS" = "darwin" ]; then - # Successful build & run the test application so add the necessary - # params to AutoConfig.kmk - cnf_append "PATH_SDK_QT4_INC" "$PATH_SDK_QT4/Frameworks" - cnf_append "PATH_SDK_QT4_LIB" "$PATH_SDK_QT4/Frameworks" - cnf_append "PATH_SDK_QT4" "$PATH_SDK_QT4/Frameworks" - # Check for the moc tool in the Qt directory found & some standard - # directories. - for q in $PATH_SDK_QT4 /usr /Developer/Tools/Qt; do - if which_wrapper "$q/bin/moc" > /dev/null; then - cnf_append "PATH_TOOL_QT4" "$q" - cnf_append "PATH_TOOL_QT4_BIN" "$q/bin" - fi - done - else # strip .../QtCore as we add components ourself INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'` # store only the first path, remove all other pathes @@ -1592,7 +1546,6 @@ fi fi done - fi fi else log_failure "qt4 not working" diff -Naur VirtualBox-4.0.0_OSE/kBuild/units/qt4.kmk VirtualBox-4.0.0_OSE.new/kBuild/units/qt4.kmk --- VirtualBox-4.0.0_OSE/kBuild/units/qt4.kmk 2010-12-05 19:17:53.000000000 +0100 +++ VirtualBox-4.0.0_OSE.new/kBuild/units/qt4.kmk 2011-01-09 01:35:19.000000000 +0100 @@ -70,13 +70,6 @@ ifeq ($(PATH_SDK_QT4),) # If target == host, try look for Qt in the various platform specific places. ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) - ifeq ($(KBUILD_TARGET),darwin) - PATH_SDK_QT4 := $(patsubst %/Frameworks/QtCore.framework/Versions/4,%,$(firstword $(wildcard /Library/Frameworks/QtCore.framework/Versions/4))) - else ifeq ($(KBUILD_TARGET),win) - # No idea here yet... - else ifeq ($(KBUILD_TARGET),ose) - # No port... - else # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT4_LIB* stuff if it doesn't work. # Try find the general root of thing by looking for the qt3to4 program, if not found, then look for rcc. PATH_SDK_QT4 := $(patsubst %/bin/qt3to4,%,$(firstword $(wildcard \ @@ -163,7 +156,6 @@ endif endif - endif # Unices endif # Found it? ifeq ($(PATH_SDK_QT4),) @@ -178,18 +170,8 @@ # Libraries can be in either Frameworks or lib depending on how you # build it on the mac. The .dmg installs into Frameworks but builds into lib. -ifeq ($(KBUILD_TARGET),darwin) - ifndef PATH_SDK_QT4_LIB - ifneq ($(wildcard $(PATH_SDK_QT4)/Frameworks),) - PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/Frameworks - else - PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib - endif - endif -else - PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib - PATH_SDK_QT4_INC ?= $(PATH_SDK_QT4)/include -endif +PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib +PATH_SDK_QT4_INC ?= $(PATH_SDK_QT4)/include # The bits that kBuild picks up. # (nothing here) @@ -953,23 +935,8 @@ $($(target)_QT_INFIX.$(bld_trg_cpu)) \ $($(target)_QT_INFIX.$(bld_type)) \ $($(target)_QT_INFIX)) -ifeq ($(bld_trg),darwin) - # Adding -F to CXXFLAGS is necessary to make #include stuff work... - $(eval $(target)_CXXFLAGS += -F$(PATH_SDK_QT4_LIB) ) - $(eval $(target)_OBJCXXFLAGS += -F$(PATH_SDK_QT4_LIB) ) - $(eval $(target)_LDFLAGS += -F$(PATH_SDK_QT4_LIB) $(foreach module,$(qt_modules), -framework $(qt_prefix)Qt$(module)$(qt_infix)) ) - $(eval $(target)_INCS += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix).framework/Versions/4/Headers) ) -else - ifeq ($(bld_trg),win) - $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix)4$(SUFF_LIB)) ) - ifeq ($(tool_do),LINK_PROGRAM) - $(eval $(target)_LIBS += $(PATH_SDK_QT4_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) ) - endif - else - $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_DLL)) ) - endif - $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT4_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT4_INC) ) -endif +$(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_DLL)) ) +$(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT4_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT4_INC) ) $(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )