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
RevLine 
[96841]1--- Config.kmk.orig     2012-06-20 08:07:42.000000000 -0500
2+++ Config.kmk  2012-08-19 05:22:48.000000000 -0500
[104076]3@@ -1147,7 +1147,7 @@
[83064]4 # of VirtualBox binaries.  We request though that you always use something that
5 # clearly identifies your build and makes it clear that it is not one done by
6 # the VirtualBox team.
7- VBOX_BUILD_PUBLISHER = _OSE
[98020]8+ VBOX_BUILD_PUBLISHER = _MACPORTS
[83064]9 endif
10 
11 # Keep in sync with G_virtualBoxPackage in glue-jaxws.xsl and glue-java.xsl
[104076]12@@ -1873,7 +1873,11 @@
[90868]13   endif
[97829]14   VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk
[90868]15  else
[97829]16-  VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
17+  ifneq ($(wildcard /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk),)
18+   VBOX_PATH_MACOSX_SDK = /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
19+  else
20+   VBOX_PATH_MACOSX_SDK = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
[90868]21+  endif
22  endif
[97829]23 
24  ## The Xcode version.
[104076]25@@ -1967,6 +1971,13 @@
[93203]26  endif
27 
28  if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.4 10.5 10.6)
29+  ifndef VBOX_PATH_MACOSX_SDK_10_6
[97829]30+   ifneq ($(wildcard $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk),)
31+    VBOX_PATH_MACOSX_SDK_10_6           = $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk
[93203]32+   else
33+    VBOX_PATH_MACOSX_SDK_10_6           = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
34+   endif
35+  endif
[97829]36   VBOX_PATH_MACOSX_SDK_10_6            ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk
[93203]37   VBOX_DARWIN_DEF_SDK_10_6_DEFS        := MAC_OS_X_VERSION_MIN_REQUIRED=1060 MAC_OS_X_VERSION_MAX_ALLOWED=1060
38   VBOX_DARWIN_DEF_SDK_10_6_CFLAGS      := -mmacosx-version-min=10.6 -isysroot $(VBOX_PATH_MACOSX_SDK_10_6)
[104076]39@@ -1985,7 +1996,7 @@
[97829]40    ifneq ($(wildcard $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.7.sdk),)
41     VBOX_PATH_MACOSX_SDK_10_7           = $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.7.sdk
[90868]42    else
43-    VBOX_PATH_MACOSX_SDK_10_7           = $(PATH_DEVTOOLS)/darwin.x86/SDKs/MacOSX10.7.sdk
44+    VBOX_PATH_MACOSX_SDK_10_7           = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
45    endif
46   endif
47   VBOX_DARWIN_DEF_SDK_10_7_DEFS        := MAC_OS_X_VERSION_MIN_REQUIRED=1070 MAC_OS_X_VERSION_MAX_ALLOWED=1070
[104076]48@@ -2165,22 +2176,22 @@
[83064]49 VBOX_GCC32_CHECK_CXX = $(2)
50 else
51 VBOX_GCC_CHECK_CC = $(shell \
[96944]52-   if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
53+   if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(subst -Wno-,-W,$(1)) -S -xc /dev/null > /dev/null 2>&1; \
[83064]54    then echo "$(1)"; \
55    else echo "$(2)"; fi; )
56 
57 VBOX_GCC_CHECK_CXX = $(shell \
[96944]58-   if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
59+   if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(subst -Wno-,-W,$(1)) -S -xc++ /dev/null > /dev/null 2>&1; \
[83064]60    then echo "$(1)"; \
61    else echo "$(2)"; fi; )
62 
63 VBOX_GCC_CHECK_LD = $(shell \
64-   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 ;\
65+   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 ;\
66    then echo "-Wl,$(1)"; \
67    else echo "$(2)"; fi; )
68 
69 VBOX_GCC32_CHECK_CXX = $(shell \
70-   if $(TOOL_$(VBOX_GCC32_TOOL)_CXX) $(1) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
71+   if $(TOOL_$(VBOX_GCC32_TOOL)_CXX) $(1) -S -xc++ /dev/null > /dev/null 2>&1; \
72    then echo "$(1)"; \
73    else echo "$(2)"; fi; )
74 endif
[105468]75@@ -4214,25 +4225,6 @@
[83064]76  # be cleaned up properly later some time (not important now).
77  #
78  ifeq ($(VBOX_PATH_QT4),)
79-  ifeq ($(KBUILD_TARGET),darwin)
80-   VBOX_PATH_QT4 := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
81-   ifeq ($(VBOX_PATH_QT4),)
82-    ifneq ($(wildcard /Library/Frameworks/QtCore.framework),)
83-     # Using the global installation (for OSE).
84-     VBOX_PATH_QT4 ?= /usr
85-     VBOX_PATH_QT4_FRAMEWORKS ?= /Library/Frameworks
86-    endif
87-   endif
88-  else if1of ($(KBUILD_TARGET), win)
[97829]89-   VBOX_PATH_QT4 ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
90-  else if1of ($(KBUILD_TARGET), linux solaris)
[83064]91-   VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
92-   ifneq ($(VBOX_PATH_QT4),)
93-    VBOX_WITH_QT4_SUN = 1
94-   endif
95-  endif
96- endif
97- ifeq ($(VBOX_PATH_QT4),)
98   if1of ($(USERNAME), bird)
99    # gentoo (64-bit)
100    VBOX_PATH_QT4          ?= /usr
101--- /dev/null   2011-08-15 19:38:06.000000000 -0500
102+++ LocalConfig.kmk     2011-08-15 19:38:17.000000000 -0500
[84688]103@@ -0,0 +1,11 @@
[86840]104+VBOX_DEF_MACOSX_VERSION_MIN = @MACOSX_DEPLOYMENT_TARGET@
[83064]105+VBOX_DARWIN_NO_COMPACT_LINKEDIT =
106+VBOX_MACOS_10_5_WORKAROUND =
[99021]107+VBOX_PATH_APP_DOCS = "@APPLICATIONS_DIR@/VirtualBox.app/Contents/MacOS"
108+VBOX_PATH_APP_PRIVATE = "@APPLICATIONS_DIR@/VirtualBox.app/Contents/MacOS"
109+VBOX_PATH_APP_PRIVATE_ARCH = "@APPLICATIONS_DIR@/VirtualBox.app/Contents/MacOS"
110+VBOX_PATH_SHARED_LIBS = "@APPLICATIONS_DIR@/VirtualBox.app/Contents/MacOS"
[84688]111+VBOX_WITH_MULTIVERSION_PYTHON = 1
[99021]112+VBOX_WITH_TESTSUITE =
113+VBOX_WITH_TESTCASES =
114+kBuildGlobalDefaults_LD_DEBUG =
[83064]115--- Makefile.kmk.orig   2011-08-15 19:38:16.000000000 -0500
116+++ Makefile.kmk        2011-08-15 19:38:16.000000000 -0500
[97829]117@@ -111,53 +111,6 @@
118 endif
119 
[83064]120 #
[97829]121-# Install our Qt DLLs / Shared Objects / Frameworks.
122-# Note: The installer fixes the darwin .dylibs when hardening is enabled.
123-#
[83064]124-ifeq ($(KBUILD_TARGET),darwin)
125- INSTALLS += qt4-bin
126- qt4-bin_MODE = 755
127- qt4-bin_INST = $(INST_VIRTUALBOX)Contents/
128- qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT4_MOD_NAMES) \
129-       ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod))
130- ifdef VBOX_WITH_COCOA_QT
131-  qt4-bin_SOURCES += \
132-       $(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 \
133-       $(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 \
134-       $(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
135- endif
136- ifneq ($(wildcard $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib),)
137-  qt4-bin_SOURCES += \
138-       $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
139- endif
140- qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
141-               ,Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod))
142- ifdef VBOX_WITH_COCOA_QT
143-  qt4-bin_SYMLINKS += \
144-       Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Resources=>Versions/4/Resources/
145- endif
146-else
[97829]147- if defined(VBOX_WITH_QT4_SUN) || defined(VBOX_WITH_QT4_PAYLOAD)
[83064]148-  ifeq ($(KBUILD_TARGET),win)
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)/$(qtmod)4$(SUFF_DLL)) \
154-       $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL)=>accessible/qtaccessiblewidgets4$(SUFF_DLL)
155-  else
156-   INSTALLS += qt4-bin
157-   qt4-bin_MODE = 755
158-   qt4-bin_INST = $(INST_BIN)
159-   qt4-bin_SOURCES = \
160-       $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT4_LIB)/lib$(qtmod)$(SUFF_DLL).4) \
161-       $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
162-  endif
163- endif # VBOX_WITH_QT4_SUN
164-endif
[97829]165-
166-
[105468]167-# Below we might need TOOL_ZIP_UNPACK (for the additions/docs/efifw packages
168 # from the build server), and it's not really worth the effort of dragging in
169 # this tool only if absolutely needed.
170 ## @todo Hack to get at TOOL_ZIP_UNPACK; see if this can be integrated somehow...
[83064]171--- configure.orig      2011-08-15 19:38:16.000000000 -0500
172+++ configure   2011-08-15 19:38:16.000000000 -0500
[101565]173@@ -1068,21 +1068,6 @@
[83064]174 check_sdl()
175 {
176   test_header SDL
177-  if [ "$OS" = "darwin" ]; then
178-    if [ -f "/System/Library/Frameworks/SDL.framework/SDL" ]; then
179-      PATH_SDK_LIBSDL="/System/Library/Frameworks/SDL.framework"
180-    elif [ -f "/Library/Frameworks/SDL.framework/SDL" ]; then
181-      PATH_SDK_LIBSDL="/Library/Frameworks/SDL.framework"
182-    fi
183-    if [ -n "$PATH_SDK_LIBSDL" ]; then
184-      foundsdl=1
185-      INCSDL="$PATH_SDK_LIBSDL/Headers"
186-      FLDSDL="-framework SDL"
187-    else
188-      log_failure "SDL framework not found"
189-      fail
190-    fi
191-  else
192     if which_wrapper sdl-config > /dev/null; then
193       FLGSDL=`sdl-config --cflags`
194       INCSDL=`strip_I "$FLGSDL"`
[101565]195@@ -1091,7 +1076,6 @@
[83064]196       FLDSDL=
197       foundsdl=1
198     fi
199-  fi
200   [ "$OS" = "linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN=""
201   if [ -n "$foundsdl" ]; then
202     cat > $ODIR.tmp_src.cc << EOF
[101565]203@@ -1439,53 +1423,20 @@
[83064]204 {
205   foundqt4=
206   test_header Qt4
207-  if [ "$OS" = "darwin" ]; then
208-    # First check if there is the internal version of Qt. If yes nothing else
209-    # has to be done.
210-    QT_INTERNAL=`/bin/ls -rd1 $PWD/tools/$BUILD_TARGET.$BUILD_PLATFORM_ARCH/qt/* 2> /dev/null`
211-    for t in $QT_INTERNAL; do
212-        if [ -f "$t/Frameworks/QtCoreVBox.framework/QtCoreVBox" ]; then
213-          cnf_append "VBOX_WITH_QT4_SUN" "1"
214-          log_success "use internal version"
215-          return
216-        fi
217-    done
218-    # Now try the user provided directory and some of the standard directories.
219-    QT_TRIES="$QT4DIR /System/Library /Library"
220-    for t in $QT_TRIES; do
221-        if [ -f "$t/Frameworks/QtCore.framework/QtCore" ]; then
222-          PATH_SDK_QT4="$t"
223-          break
224-        fi
225-    done
226-    # Add the necessary params for building the test application
227-    if [ -n "$PATH_SDK_QT4" ]; then
228-      foundqt4=1
229-      INCQT4=-I$PATH_SDK_QT4/Frameworks/QtCore.framework/Headers
230-      LIBQT4=-F$PATH_SDK_QT4/Frameworks
231-      FLGQT4="-framework QtCore"
232-    else
233-      log_failure "Qt4 framework not found (can be disabled using --disable-qt4)"
234-      fail
235-    fi
236-  else
237     if [ $QT4DIR_PKGCONFIG -eq 1 ]; then
238       # default is to use pkg-config
239       if which_wrapper pkg-config > /dev/null; then
240         # this braindead path is necessary for mdv2008.1
241         qt4_ver=`\
[97829]242-            PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
[83064]243             pkg-config QtCore --modversion 2>> $LOG`
244         if [ $? -ne 0 ]; then
245           log_failure "QtCore not found"
246           fail
247         else
248           FLGQT4=`\
[97829]249-              PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
[83064]250               pkg-config QtCore --cflags`
251           INCQT4=`strip_I "$FLGQT4"`
252           LIBQT4=`\
[97829]253-              PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
[83064]254               PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
255               pkg-config QtCore --libs`
256           foundqt4=1
[101565]257@@ -1527,7 +1478,6 @@
[83064]258         fi
259       done
260     fi
261-  fi
262   if [ -n "$foundqt4" ]; then
263     cat > $ODIR.tmp_src.cc << EOF
264 #include <cstdio>
[101565]265@@ -1547,21 +1497,6 @@
[83064]266     [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"`
267     if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
268       if test_execute_path "`strip_L "$LIBQT4"`"; then
269-        if [ "$OS" = "darwin" ]; then
270-          # Successful build & run the test application so add the necessary
271-          # params to AutoConfig.kmk
272-          cnf_append "PATH_SDK_QT4_INC" "$PATH_SDK_QT4/Frameworks"
273-          cnf_append "PATH_SDK_QT4_LIB" "$PATH_SDK_QT4/Frameworks"
274-          cnf_append "PATH_SDK_QT4" "$PATH_SDK_QT4/Frameworks"
275-          # Check for the moc tool in the Qt directory found & some standard
276-          # directories.
277-          for q in $PATH_SDK_QT4 /usr /Developer/Tools/Qt; do
278-            if which_wrapper "$q/bin/moc" > /dev/null; then
279-              cnf_append "PATH_TOOL_QT4" "$q"
280-              cnf_append "PATH_TOOL_QT4_BIN" "$q/bin"
281-            fi
282-          done
283-        else
284           # strip .../QtCore as we add components ourself
285           INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'`
286           # store only the first path, remove all other pathes
[101565]287@@ -1607,7 +1542,6 @@
[83064]288               fi
289             fi
290           done
291-        fi
292       fi
293     else
294       log_failure "qt4 not working"
[105468]295@@ -2067,19 +2001,55 @@
[96944]296   test_header "Darwin version"
297   darwin_ver=`uname -r`
[93203]298   case "$darwin_ver" in
[96944]299+    12\.*)
300+      darwin_ver="10.8" # Mountain Lion
301+
[97826]302+      if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"; } then
303+          sdk="`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"
[96944]304+      else
305+          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
306+      fi
307+
308+      CXX_FLAGS="-mmacosx-version-min=10.7 -isysroot $sdk -Wl,-syslibroot,$sdk"
309+      ;;
[93203]310     11\.*)
311       darwin_ver="10.7" # Lion
312-      sdk=/Developer/SDKs/MacOSX10.6.sdk
[97826]313-      CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
[93203]314+
[97826]315+      if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"; } then
316+          # Developer tools are not bundled in Xcode.app.
317+          sdk="`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"
318+          CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
319+      elif { test -d "`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"; } then
320+          # Developer tools are bundled in Xcode.app.
321+          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
322+          CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
[93203]323+      else
[97826]324+          # Developer tools are bundled in Xcode.app and there's no 10.6 SDK; default to 10.7.
325+          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
326+          CXX_FLAGS="-mmacosx-version-min=10.7 -isysroot $sdk -Wl,-syslibroot,$sdk"
[93203]327+      fi
328       ;;
329     10\.*)
330       darwin_ver="10.6" # Snow Leopard
331+
332       if [ "$BUILD_MACHINE" = "x86" ]; then
333-          sdk=/Developer/SDKs/MacOSX10.5.sdk
334+
[97826]335+          if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"; } then
336+              sdk="`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"
[93203]337+          else
338+              sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk"
339+          fi
340+
341           CXX_FLAGS="-mmacosx-version-min=10.5 -isysroot $sdk -Wl,-syslibroot,$sdk"
342           cnf_append "VBOX_MACOS_10_5_WORKAROUND" "1"
343       else
344-          sdk=/Developer/SDKs/MacOSX10.6.sdk
345+
346+          if { test -d "/Developer/SDKs/MacOSX10.6.sdk"; } then
347+              sdk="/Developer/SDKs/MacOSX10.6.sdk"
348+          else
349+              sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
350+          fi
351+
352           CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
353       fi
354 #      test "$CC" = "gcc" && CC="gcc-4.0"
[105468]355@@ -2276,7 +2246,7 @@
[83064]356     --with-openssl-dir=*)
357       OPENSSLDIR=`echo $option | cut -d'=' -f2`
358       INCCRYPTO="-I${OPENSSLDIR}/include"
359-      LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.a ${OPENSSLDIR}/lib/libssl.a"
360+      LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.dylib ${OPENSSLDIR}/lib/libssl.dylib"
361       ;;
[97829]362     --with-ow-dir=*)
363       WATCOM=`echo $option | cut -d'=' -f2`
[83064]364--- kBuild/units/qt4.kmk.orig   2011-08-15 19:38:16.000000000 -0500
365+++ kBuild/units/qt4.kmk        2011-08-15 19:38:16.000000000 -0500
366@@ -70,13 +70,6 @@
367  ifeq ($(PATH_SDK_QT4),)
368   # If target == host, try look for Qt in the various platform specific places.
369   ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
370-   ifeq ($(KBUILD_TARGET),darwin)
371-    PATH_SDK_QT4 := $(patsubst %/Frameworks/QtCore.framework/Versions/4,%,$(firstword $(wildcard /Library/Frameworks/QtCore.framework/Versions/4)))
372-   else ifeq ($(KBUILD_TARGET),win)
373-    # No idea here yet...
374-   else ifeq ($(KBUILD_TARGET),ose)
375-    # No port...
376-   else
377     # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT4_LIB* stuff if it doesn't work.
378     # Try find the general root of thing by looking for the qt3to4 program, if not found, then look for rcc.
379     PATH_SDK_QT4 := $(patsubst %/bin/qt3to4,%,$(firstword $(wildcard \
[85683]380@@ -169,7 +162,6 @@
[83064]381      endif
382 
383     endif
384-   endif # Unices
385   endif
386   # Found it?
387   ifeq ($(PATH_SDK_QT4),)
[85683]388@@ -184,18 +176,8 @@
[83064]389 
390 # Libraries can be in either Frameworks or lib depending on how you
391 # build it on the mac. The .dmg installs into Frameworks but builds into lib.
392-ifeq ($(KBUILD_TARGET),darwin)
393- ifndef PATH_SDK_QT4_LIB
394-  ifneq ($(wildcard $(PATH_SDK_QT4)/Frameworks),)
395-   PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/Frameworks
396-  else
397-   PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib
398-  endif
399- endif
400-else
401- PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib
402- PATH_SDK_QT4_INC ?= $(PATH_SDK_QT4)/include
403-endif
404+PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib
405+PATH_SDK_QT4_INC ?= $(PATH_SDK_QT4)/include
406 
407 # The bits that kBuild picks up.
408 #  (nothing here)
[85683]409@@ -959,23 +941,8 @@
[83064]410        $($(target)_QT_INFIX.$(bld_trg_cpu)) \
411        $($(target)_QT_INFIX.$(bld_type)) \
412        $($(target)_QT_INFIX))
413-ifeq ($(bld_trg),darwin)
414- # Adding -F to CXXFLAGS is necessary to make #include <QtCore/qstring.h> stuff work...
415- $(eval $(target)_CXXFLAGS += -F$(PATH_SDK_QT4_LIB) )
416- $(eval $(target)_OBJCXXFLAGS += -F$(PATH_SDK_QT4_LIB) )
417- $(eval $(target)_LDFLAGS  += -F$(PATH_SDK_QT4_LIB) $(foreach module,$(qt_modules), -framework $(qt_prefix)Qt$(module)$(qt_infix)) )
418- $(eval $(target)_INCS     += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix).framework/Versions/4/Headers) )
419-else
420- ifeq ($(bld_trg),win)
421-  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix)4$(SUFF_LIB)) )
422-  ifeq ($(tool_do),LINK_PROGRAM)
423-   $(eval $(target)_LIBS   += $(PATH_SDK_QT4_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )
424-  endif
425- else
426-  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_DLL)) )
427- endif
428- $(eval $(target)_INCS     += $(addprefix $(PATH_SDK_QT4_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT4_INC) )
429-endif
430+$(eval $(target)_LIBS      += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_DLL)) )
431+$(eval $(target)_INCS      += $(addprefix $(PATH_SDK_QT4_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT4_INC) )
432 $(eval $(target)_DEFS      += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
433 
434 
[101907]435--- src/libs/xpcom18a4/Config.kmk.orig  2013-01-21 13:27:34.000000000 -0500
436+++ src/libs/xpcom18a4/Config.kmk   2013-01-21 13:27:34.000000000 -0500
437@@ -228,6 +228,7 @@
438  TEMPLATE_XPCOMOSX104_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_4)/Developer/Headers/FlatCarbon
439 endif
440 
441+ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.5)
442 #
443 # Template for building VBoxPython against the Mac OS X 10.5 SDK.
444 # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
445@@ -239,7 +240,9 @@
446 TEMPLATE_XPCOMOSX105_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS)
447 TEMPLATE_XPCOMOSX105_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
448 TEMPLATE_XPCOMOSX105_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_5)/Developer/Headers/FlatCarbon
449+endif
450 
451+ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.6)
452 #
453 # Template for building VBoxPhython against the Mac OS X 10.6 SDK.
454 # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
455@@ -251,7 +254,9 @@
456 TEMPLATE_XPCOMOSX106_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS)
457 TEMPLATE_XPCOMOSX106_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
458 TEMPLATE_XPCOMOSX106_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_6)/Developer/Headers/FlatCarbon
459+endif
460 
461+ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.7)
462 #
463 # Template for building VBoxPhython against the Mac OS X 10.7 SDK.
464 # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
465@@ -264,6 +269,7 @@
466 TEMPLATE_XPCOMOSX107_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS)
467 TEMPLATE_XPCOMOSX107_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
468 TEMPLATE_XPCOMOSX107_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_7)/Developer/Headers/FlatCarbon
469+endif
470 
471 
472 #
[96944]473--- src/libs/xpcom18a4/python/Makefile.kmk.orig 2012-08-21 20:52:14.000000000 -0400
474+++ src/libs/xpcom18a4/python/Makefile.kmk      2012-08-21 20:53:59.000000000 -0400
[97826]475@@ -34,14 +34,14 @@
[96944]476   VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
477  endif
[97826]478  if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
[96944]479-  && (   !defined(VBOX_OSE) \
480-      || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
[97826]481+  && defined(VBOX_PATH_MACOSX_SDK_10_6)
482+  && ("$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
[96944]483   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
484   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
485  endif
[97826]486  if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
[96944]487-  && (   defined(VBOX_NOT_OSE_LATER_SOMETIME) \
488-      || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
[97826]489+  && defined(VBOX_PATH_MACOSX_SDK_10_7)
490+  && ("$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
[96944]491   VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
492   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
493  endif
Note: See TracBrowser for help on using the repository browser.