source: trunk/dports/emulators/virtualbox/files/patch-build.diff @ 105468

Last change on this file since 105468 was 105468, checked in by royliu@…, 7 years ago

virtualbox: update to 4.2.12

File size: 21.7 KB
  • Config.kmk

    old new  
    11471147# of VirtualBox binaries.  We request though that you always use something that
    11481148# clearly identifies your build and makes it clear that it is not one done by
    11491149# the VirtualBox team.
    1150  VBOX_BUILD_PUBLISHER = _OSE
     1150 VBOX_BUILD_PUBLISHER = _MACPORTS
    11511151endif
    11521152
    11531153# Keep in sync with G_virtualBoxPackage in glue-jaxws.xsl and glue-java.xsl
     
    18731873  endif
    18741874  VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk
    18751875 else
    1876   VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
     1876  ifneq ($(wildcard /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk),)
     1877   VBOX_PATH_MACOSX_SDK = /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
     1878  else
     1879   VBOX_PATH_MACOSX_SDK = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
     1880  endif
    18771881 endif
    18781882
    18791883 ## The Xcode version.
     
    19671971 endif
    19681972
    19691973 if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.4 10.5 10.6)
     1974  ifndef VBOX_PATH_MACOSX_SDK_10_6
     1975   ifneq ($(wildcard $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk),)
     1976    VBOX_PATH_MACOSX_SDK_10_6           = $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk
     1977   else
     1978    VBOX_PATH_MACOSX_SDK_10_6           = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
     1979   endif
     1980  endif
    19701981  VBOX_PATH_MACOSX_SDK_10_6            ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk
    19711982  VBOX_DARWIN_DEF_SDK_10_6_DEFS        := MAC_OS_X_VERSION_MIN_REQUIRED=1060 MAC_OS_X_VERSION_MAX_ALLOWED=1060
    19721983  VBOX_DARWIN_DEF_SDK_10_6_CFLAGS      := -mmacosx-version-min=10.6 -isysroot $(VBOX_PATH_MACOSX_SDK_10_6)
     
    19851996   ifneq ($(wildcard $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.7.sdk),)
    19861997    VBOX_PATH_MACOSX_SDK_10_7           = $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.7.sdk
    19871998   else
    1988     VBOX_PATH_MACOSX_SDK_10_7           = $(PATH_DEVTOOLS)/darwin.x86/SDKs/MacOSX10.7.sdk
     1999    VBOX_PATH_MACOSX_SDK_10_7           = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
    19892000   endif
    19902001  endif
    19912002  VBOX_DARWIN_DEF_SDK_10_7_DEFS        := MAC_OS_X_VERSION_MIN_REQUIRED=1070 MAC_OS_X_VERSION_MAX_ALLOWED=1070
     
    21652176VBOX_GCC32_CHECK_CXX = $(2)
    21662177else
    21672178VBOX_GCC_CHECK_CC = $(shell \
    2168    if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
     2179   if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(subst -Wno-,-W,$(1)) -S -xc /dev/null > /dev/null 2>&1; \
    21692180   then echo "$(1)"; \
    21702181   else echo "$(2)"; fi; )
    21712182
    21722183VBOX_GCC_CHECK_CXX = $(shell \
    2173    if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
     2184   if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(subst -Wno-,-W,$(1)) -S -xc++ /dev/null > /dev/null 2>&1; \
    21742185   then echo "$(1)"; \
    21752186   else echo "$(2)"; fi; )
    21762187
    21772188VBOX_GCC_CHECK_LD = $(shell \
    2178    if $(TOOL_$(VBOX_GCC_TOOL)_LD) -Wl,$(1) $(if $(eq $(KBUILD_HOST),darwin),-Wl$(COMMA)-u$(COMMA)start -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup,) -nostdlib -o /dev/null -xc /dev/null > /dev/null 2>&1 ;\
     2189   if $(TOOL_$(VBOX_GCC_TOOL)_LD) -Wl,$(1) $(if $(eq $(KBUILD_HOST),darwin),-Wl$(COMMA)-u$(COMMA)start -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup,) -nostdlib -xc /dev/null > /dev/null 2>&1 ;\
    21792190   then echo "-Wl,$(1)"; \
    21802191   else echo "$(2)"; fi; )
    21812192
    21822193VBOX_GCC32_CHECK_CXX = $(shell \
    2183    if $(TOOL_$(VBOX_GCC32_TOOL)_CXX) $(1) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
     2194   if $(TOOL_$(VBOX_GCC32_TOOL)_CXX) $(1) -S -xc++ /dev/null > /dev/null 2>&1; \
    21842195   then echo "$(1)"; \
    21852196   else echo "$(2)"; fi; )
    21862197endif
     
    42144225 # be cleaned up properly later some time (not important now).
    42154226 #
    42164227 ifeq ($(VBOX_PATH_QT4),)
    4217   ifeq ($(KBUILD_TARGET),darwin)
    4218    VBOX_PATH_QT4 := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
    4219    ifeq ($(VBOX_PATH_QT4),)
    4220     ifneq ($(wildcard /Library/Frameworks/QtCore.framework),)
    4221      # Using the global installation (for OSE).
    4222      VBOX_PATH_QT4 ?= /usr
    4223      VBOX_PATH_QT4_FRAMEWORKS ?= /Library/Frameworks
    4224     endif
    4225    endif
    4226   else if1of ($(KBUILD_TARGET), win)
    4227    VBOX_PATH_QT4 ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
    4228   else if1of ($(KBUILD_TARGET), linux solaris)
    4229    VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
    4230    ifneq ($(VBOX_PATH_QT4),)
    4231     VBOX_WITH_QT4_SUN = 1
    4232    endif
    4233   endif
    4234  endif
    4235  ifeq ($(VBOX_PATH_QT4),)
    42364228  if1of ($(USERNAME), bird)
    42374229   # gentoo (64-bit)
    42384230   VBOX_PATH_QT4          ?= /usr
  • new file LocalConfig.kmk

    - +  
     1VBOX_DEF_MACOSX_VERSION_MIN = @MACOSX_DEPLOYMENT_TARGET@
     2VBOX_DARWIN_NO_COMPACT_LINKEDIT =
     3VBOX_MACOS_10_5_WORKAROUND =
     4VBOX_PATH_APP_DOCS = "@APPLICATIONS_DIR@/VirtualBox.app/Contents/MacOS"
     5VBOX_PATH_APP_PRIVATE = "@APPLICATIONS_DIR@/VirtualBox.app/Contents/MacOS"
     6VBOX_PATH_APP_PRIVATE_ARCH = "@APPLICATIONS_DIR@/VirtualBox.app/Contents/MacOS"
     7VBOX_PATH_SHARED_LIBS = "@APPLICATIONS_DIR@/VirtualBox.app/Contents/MacOS"
     8VBOX_WITH_MULTIVERSION_PYTHON = 1
     9VBOX_WITH_TESTSUITE =
     10VBOX_WITH_TESTCASES =
     11kBuildGlobalDefaults_LD_DEBUG =
  • Makefile.kmk

    old new  
    111111endif
    112112
    113113#
    114 # Install our Qt DLLs / Shared Objects / Frameworks.
    115 # Note: The installer fixes the darwin .dylibs when hardening is enabled.
    116 #
    117 ifeq ($(KBUILD_TARGET),darwin)
    118  INSTALLS += qt4-bin
    119  qt4-bin_MODE = 755
    120  qt4-bin_INST = $(INST_VIRTUALBOX)Contents/
    121  qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT4_MOD_NAMES) \
    122         ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod))
    123  ifdef VBOX_WITH_COCOA_QT
    124   qt4-bin_SOURCES += \
    125         $(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 \
    126         $(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 \
    127         $(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
    128  endif
    129  ifneq ($(wildcard $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib),)
    130   qt4-bin_SOURCES += \
    131         $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
    132  endif
    133  qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
    134                 ,Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod))
    135  ifdef VBOX_WITH_COCOA_QT
    136   qt4-bin_SYMLINKS += \
    137         Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Resources=>Versions/4/Resources/
    138  endif
    139 else
    140  if defined(VBOX_WITH_QT4_SUN) || defined(VBOX_WITH_QT4_PAYLOAD)
    141   ifeq ($(KBUILD_TARGET),win)
    142    INSTALLS += qt4-bin
    143    qt4-bin_MODE = 755
    144    qt4-bin_INST = $(INST_BIN)
    145    qt4-bin_SOURCES = \
    146         $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT4_LIB)/$(qtmod)4$(SUFF_DLL)) \
    147         $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL)=>accessible/qtaccessiblewidgets4$(SUFF_DLL)
    148   else
    149    INSTALLS += qt4-bin
    150    qt4-bin_MODE = 755
    151    qt4-bin_INST = $(INST_BIN)
    152    qt4-bin_SOURCES = \
    153         $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT4_LIB)/lib$(qtmod)$(SUFF_DLL).4) \
    154         $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
    155   endif
    156  endif # VBOX_WITH_QT4_SUN
    157 endif
    158 
    159 
    160 # Below we might need TOOL_ZIP_UNPACK (for the additions/docs/efifw packages
    161114# from the build server), and it's not really worth the effort of dragging in
    162115# this tool only if absolutely needed.
    163116## @todo Hack to get at TOOL_ZIP_UNPACK; see if this can be integrated somehow...
  • configure

    old new  
    10681068check_sdl()
    10691069{
    10701070  test_header SDL
    1071   if [ "$OS" = "darwin" ]; then
    1072     if [ -f "/System/Library/Frameworks/SDL.framework/SDL" ]; then
    1073       PATH_SDK_LIBSDL="/System/Library/Frameworks/SDL.framework"
    1074     elif [ -f "/Library/Frameworks/SDL.framework/SDL" ]; then
    1075       PATH_SDK_LIBSDL="/Library/Frameworks/SDL.framework"
    1076     fi
    1077     if [ -n "$PATH_SDK_LIBSDL" ]; then
    1078       foundsdl=1
    1079       INCSDL="$PATH_SDK_LIBSDL/Headers"
    1080       FLDSDL="-framework SDL"
    1081     else
    1082       log_failure "SDL framework not found"
    1083       fail
    1084     fi
    1085   else
    10861071    if which_wrapper sdl-config > /dev/null; then
    10871072      FLGSDL=`sdl-config --cflags`
    10881073      INCSDL=`strip_I "$FLGSDL"`
     
    10911076      FLDSDL=
    10921077      foundsdl=1
    10931078    fi
    1094   fi
    10951079  [ "$OS" = "linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN=""
    10961080  if [ -n "$foundsdl" ]; then
    10971081    cat > $ODIR.tmp_src.cc << EOF
     
    14391423{
    14401424  foundqt4=
    14411425  test_header Qt4
    1442   if [ "$OS" = "darwin" ]; then
    1443     # First check if there is the internal version of Qt. If yes nothing else
    1444     # has to be done.
    1445     QT_INTERNAL=`/bin/ls -rd1 $PWD/tools/$BUILD_TARGET.$BUILD_PLATFORM_ARCH/qt/* 2> /dev/null`
    1446     for t in $QT_INTERNAL; do
    1447         if [ -f "$t/Frameworks/QtCoreVBox.framework/QtCoreVBox" ]; then
    1448           cnf_append "VBOX_WITH_QT4_SUN" "1"
    1449           log_success "use internal version"
    1450           return
    1451         fi
    1452     done
    1453     # Now try the user provided directory and some of the standard directories.
    1454     QT_TRIES="$QT4DIR /System/Library /Library"
    1455     for t in $QT_TRIES; do
    1456         if [ -f "$t/Frameworks/QtCore.framework/QtCore" ]; then
    1457           PATH_SDK_QT4="$t"
    1458           break
    1459         fi
    1460     done
    1461     # Add the necessary params for building the test application
    1462     if [ -n "$PATH_SDK_QT4" ]; then
    1463       foundqt4=1
    1464       INCQT4=-I$PATH_SDK_QT4/Frameworks/QtCore.framework/Headers
    1465       LIBQT4=-F$PATH_SDK_QT4/Frameworks
    1466       FLGQT4="-framework QtCore"
    1467     else
    1468       log_failure "Qt4 framework not found (can be disabled using --disable-qt4)"
    1469       fail
    1470     fi
    1471   else
    14721426    if [ $QT4DIR_PKGCONFIG -eq 1 ]; then
    14731427      # default is to use pkg-config
    14741428      if which_wrapper pkg-config > /dev/null; then
    14751429        # this braindead path is necessary for mdv2008.1
    14761430        qt4_ver=`\
    1477             PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
    14781431            pkg-config QtCore --modversion 2>> $LOG`
    14791432        if [ $? -ne 0 ]; then
    14801433          log_failure "QtCore not found"
    14811434          fail
    14821435        else
    14831436          FLGQT4=`\
    1484               PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
    14851437              pkg-config QtCore --cflags`
    14861438          INCQT4=`strip_I "$FLGQT4"`
    14871439          LIBQT4=`\
    1488               PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
    14891440              PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
    14901441              pkg-config QtCore --libs`
    14911442          foundqt4=1
     
    15271478        fi
    15281479      done
    15291480    fi
    1530   fi
    15311481  if [ -n "$foundqt4" ]; then
    15321482    cat > $ODIR.tmp_src.cc << EOF
    15331483#include <cstdio>
     
    15471497    [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"`
    15481498    if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
    15491499      if test_execute_path "`strip_L "$LIBQT4"`"; then
    1550         if [ "$OS" = "darwin" ]; then
    1551           # Successful build & run the test application so add the necessary
    1552           # params to AutoConfig.kmk
    1553           cnf_append "PATH_SDK_QT4_INC" "$PATH_SDK_QT4/Frameworks"
    1554           cnf_append "PATH_SDK_QT4_LIB" "$PATH_SDK_QT4/Frameworks"
    1555           cnf_append "PATH_SDK_QT4" "$PATH_SDK_QT4/Frameworks"
    1556           # Check for the moc tool in the Qt directory found & some standard
    1557           # directories.
    1558           for q in $PATH_SDK_QT4 /usr /Developer/Tools/Qt; do
    1559             if which_wrapper "$q/bin/moc" > /dev/null; then
    1560               cnf_append "PATH_TOOL_QT4" "$q"
    1561               cnf_append "PATH_TOOL_QT4_BIN" "$q/bin"
    1562             fi
    1563           done
    1564         else
    15651500          # strip .../QtCore as we add components ourself
    15661501          INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'`
    15671502          # store only the first path, remove all other pathes
     
    16071542              fi
    16081543            fi
    16091544          done
    1610         fi
    16111545      fi
    16121546    else
    16131547      log_failure "qt4 not working"
     
    20672001  test_header "Darwin version"
    20682002  darwin_ver=`uname -r`
    20692003  case "$darwin_ver" in
     2004    12\.*)
     2005      darwin_ver="10.8" # Mountain Lion
     2006
     2007      if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"; } then
     2008          sdk="`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"
     2009      else
     2010          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
     2011      fi
     2012
     2013      CXX_FLAGS="-mmacosx-version-min=10.7 -isysroot $sdk -Wl,-syslibroot,$sdk"
     2014      ;;
    20702015    11\.*)
    20712016      darwin_ver="10.7" # Lion
    2072       sdk=/Developer/SDKs/MacOSX10.6.sdk
    2073       CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
     2017
     2018      if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"; } then
     2019          # Developer tools are not bundled in Xcode.app.
     2020          sdk="`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"
     2021          CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
     2022      elif { test -d "`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"; } then
     2023          # Developer tools are bundled in Xcode.app.
     2024          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
     2025          CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
     2026      else
     2027          # Developer tools are bundled in Xcode.app and there's no 10.6 SDK; default to 10.7.
     2028          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
     2029          CXX_FLAGS="-mmacosx-version-min=10.7 -isysroot $sdk -Wl,-syslibroot,$sdk"
     2030      fi
    20742031      ;;
    20752032    10\.*)
    20762033      darwin_ver="10.6" # Snow Leopard
     2034
    20772035      if [ "$BUILD_MACHINE" = "x86" ]; then
    2078           sdk=/Developer/SDKs/MacOSX10.5.sdk
     2036
     2037          if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"; } then
     2038              sdk="`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"
     2039          else
     2040              sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk"
     2041          fi
     2042
    20792043          CXX_FLAGS="-mmacosx-version-min=10.5 -isysroot $sdk -Wl,-syslibroot,$sdk"
    20802044          cnf_append "VBOX_MACOS_10_5_WORKAROUND" "1"
    20812045      else
    2082           sdk=/Developer/SDKs/MacOSX10.6.sdk
     2046
     2047          if { test -d "/Developer/SDKs/MacOSX10.6.sdk"; } then
     2048              sdk="/Developer/SDKs/MacOSX10.6.sdk"
     2049          else
     2050              sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
     2051          fi
     2052
    20832053          CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
    20842054      fi
    20852055#      test "$CC" = "gcc" && CC="gcc-4.0"
     
    22762246    --with-openssl-dir=*)
    22772247      OPENSSLDIR=`echo $option | cut -d'=' -f2`
    22782248      INCCRYPTO="-I${OPENSSLDIR}/include"
    2279       LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.a ${OPENSSLDIR}/lib/libssl.a"
     2249      LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.dylib ${OPENSSLDIR}/lib/libssl.dylib"
    22802250      ;;
    22812251    --with-ow-dir=*)
    22822252      WATCOM=`echo $option | cut -d'=' -f2`
  • kBuild/units/qt4.kmk

    old new  
    7070 ifeq ($(PATH_SDK_QT4),)
    7171  # If target == host, try look for Qt in the various platform specific places.
    7272  ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    73    ifeq ($(KBUILD_TARGET),darwin)
    74     PATH_SDK_QT4 := $(patsubst %/Frameworks/QtCore.framework/Versions/4,%,$(firstword $(wildcard /Library/Frameworks/QtCore.framework/Versions/4)))
    75    else ifeq ($(KBUILD_TARGET),win)
    76     # No idea here yet...
    77    else ifeq ($(KBUILD_TARGET),ose)
    78     # No port...
    79    else
    8073    # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT4_LIB* stuff if it doesn't work.
    8174    # Try find the general root of thing by looking for the qt3to4 program, if not found, then look for rcc.
    8275    PATH_SDK_QT4 := $(patsubst %/bin/qt3to4,%,$(firstword $(wildcard \
     
    169162     endif
    170163
    171164    endif
    172    endif # Unices
    173165  endif
    174166  # Found it?
    175167  ifeq ($(PATH_SDK_QT4),)
     
    184176
    185177# Libraries can be in either Frameworks or lib depending on how you
    186178# build it on the mac. The .dmg installs into Frameworks but builds into lib.
    187 ifeq ($(KBUILD_TARGET),darwin)
    188  ifndef PATH_SDK_QT4_LIB
    189   ifneq ($(wildcard $(PATH_SDK_QT4)/Frameworks),)
    190    PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/Frameworks
    191   else
    192    PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib
    193   endif
    194  endif
    195 else
    196  PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib
    197  PATH_SDK_QT4_INC ?= $(PATH_SDK_QT4)/include
    198 endif
     179PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib
     180PATH_SDK_QT4_INC ?= $(PATH_SDK_QT4)/include
    199181
    200182# The bits that kBuild picks up.
    201183#  (nothing here)
     
    959941        $($(target)_QT_INFIX.$(bld_trg_cpu)) \
    960942        $($(target)_QT_INFIX.$(bld_type)) \
    961943        $($(target)_QT_INFIX))
    962 ifeq ($(bld_trg),darwin)
    963  # Adding -F to CXXFLAGS is necessary to make #include <QtCore/qstring.h> stuff work...
    964  $(eval $(target)_CXXFLAGS += -F$(PATH_SDK_QT4_LIB) )
    965  $(eval $(target)_OBJCXXFLAGS += -F$(PATH_SDK_QT4_LIB) )
    966  $(eval $(target)_LDFLAGS  += -F$(PATH_SDK_QT4_LIB) $(foreach module,$(qt_modules), -framework $(qt_prefix)Qt$(module)$(qt_infix)) )
    967  $(eval $(target)_INCS     += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix).framework/Versions/4/Headers) )
    968 else
    969  ifeq ($(bld_trg),win)
    970   $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix)4$(SUFF_LIB)) )
    971   ifeq ($(tool_do),LINK_PROGRAM)
    972    $(eval $(target)_LIBS   += $(PATH_SDK_QT4_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )
    973   endif
    974  else
    975   $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_DLL)) )
    976  endif
    977  $(eval $(target)_INCS     += $(addprefix $(PATH_SDK_QT4_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT4_INC) )
    978 endif
     944$(eval $(target)_LIBS      += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_DLL)) )
     945$(eval $(target)_INCS      += $(addprefix $(PATH_SDK_QT4_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT4_INC) )
    979946$(eval $(target)_DEFS      += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
    980947
    981948
  • src/libs/xpcom18a4/Config.kmk

    old new  
    228228 TEMPLATE_XPCOMOSX104_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_4)/Developer/Headers/FlatCarbon
    229229endif
    230230
     231ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.5)
    231232#
    232233# Template for building VBoxPython against the Mac OS X 10.5 SDK.
    233234# ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
     
    239240TEMPLATE_XPCOMOSX105_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS)
    240241TEMPLATE_XPCOMOSX105_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
    241242TEMPLATE_XPCOMOSX105_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_5)/Developer/Headers/FlatCarbon
     243endif
    242244
     245ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.6)
    243246#
    244247# Template for building VBoxPhython against the Mac OS X 10.6 SDK.
    245248# ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
     
    251254TEMPLATE_XPCOMOSX106_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS)
    252255TEMPLATE_XPCOMOSX106_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
    253256TEMPLATE_XPCOMOSX106_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_6)/Developer/Headers/FlatCarbon
     257endif
    254258
     259ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.7)
    255260#
    256261# Template for building VBoxPhython against the Mac OS X 10.7 SDK.
    257262# ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
     
    264269TEMPLATE_XPCOMOSX107_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS)
    265270TEMPLATE_XPCOMOSX107_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
    266271TEMPLATE_XPCOMOSX107_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_7)/Developer/Headers/FlatCarbon
     272endif
    267273
    268274
    269275#
  • src/libs/xpcom18a4/python/Makefile.kmk

    old new  
    3434  VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
    3535 endif
    3636 if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
    37   && (   !defined(VBOX_OSE) \
    38       || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
     37  && defined(VBOX_PATH_MACOSX_SDK_10_6)
     38  && ("$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
    3939  VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
    4040  VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
    4141 endif
    4242 if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
    43   && (   defined(VBOX_NOT_OSE_LATER_SOMETIME) \
    44       || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
     43  && defined(VBOX_PATH_MACOSX_SDK_10_7)
     44  && ("$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
    4545  VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
    4646  VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
    4747 endif
Note: See TracBrowser for help on using the repository browser.