[97826] trunk/dports/emulators/virtualbox
royliu at macports.org
royliu at macports.org
Sun Sep 16 18:52:04 PDT 2012
Revision: 97826
http://trac.macports.org//changeset/97826
Author: royliu at macports.org
Date: 2012-09-16 18:52:04 -0700 (Sun, 16 Sep 2012)
Log Message:
-----------
virtualbox: fix the build process
Modified Paths:
--------------
trunk/dports/emulators/virtualbox/Portfile
trunk/dports/emulators/virtualbox/files/patch-build.diff
Removed Paths:
-------------
trunk/dports/emulators/virtualbox/files/patch-configure.diff
Modified: trunk/dports/emulators/virtualbox/Portfile
===================================================================
--- trunk/dports/emulators/virtualbox/Portfile 2012-09-17 01:02:08 UTC (rev 97825)
+++ trunk/dports/emulators/virtualbox/Portfile 2012-09-17 01:52:04 UTC (rev 97826)
@@ -59,8 +59,7 @@
patchfiles patch-build.diff \
patch-glext.h.diff \
- patch-startup.diff \
- patch-configure.diff
+ patch-startup.diff
configure.compiler gcc-4.2
Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff 2012-09-17 01:02:08 UTC (rev 97825)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff 2012-09-17 01:52:04 UTC (rev 97826)
@@ -289,15 +289,15 @@
fi
else
log_failure "qt4 not working"
-@@ -2013,19 +1947,49 @@
+@@ -2013,19 +1947,55 @@
test_header "Darwin version"
darwin_ver=`uname -r`
case "$darwin_ver" in
+ 12\.*)
+ darwin_ver="10.8" # Mountain Lion
+
-+ if { test -d "/Developer/SDKs/MacOSX10.7.sdk"; } then
-+ sdk="/Developer/SDKs/MacOSX10.7.sdk"
++ if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"; } then
++ sdk="`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"
+ else
+ sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
+ fi
@@ -307,14 +307,21 @@
11\.*)
darwin_ver="10.7" # Lion
- sdk=/Developer/SDKs/MacOSX10.6.sdk
+- CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
+
-+ if { test -d "/Developer/SDKs/MacOSX10.6.sdk"; } then
-+ sdk="/Developer/SDKs/MacOSX10.6.sdk"
++ if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"; } then
++ # Developer tools are not bundled in Xcode.app.
++ sdk="`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"
++ CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
++ elif { test -d "`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"; } then
++ # Developer tools are bundled in Xcode.app.
++ sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
++ CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
+ else
-+ sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
++ # Developer tools are bundled in Xcode.app and there's no 10.6 SDK; default to 10.7.
++ sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
++ CXX_FLAGS="-mmacosx-version-min=10.7 -isysroot $sdk -Wl,-syslibroot,$sdk"
+ fi
-+
- CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
;;
10\.*)
darwin_ver="10.6" # Snow Leopard
@@ -322,8 +329,8 @@
if [ "$BUILD_MACHINE" = "x86" ]; then
- sdk=/Developer/SDKs/MacOSX10.5.sdk
+
-+ if { test -d "/Developer/SDKs/MacOSX10.5.sdk"; } then
-+ sdk="/Developer/SDKs/MacOSX10.5.sdk"
++ if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"; } then
++ sdk="`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"
+ else
+ sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk"
+ fi
@@ -424,21 +431,22 @@
--- 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
-@@ -33,15 +33,11 @@ ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
- VBOX_PYTHON25_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.5
+@@ -34,14 +34,14 @@
VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
endif
-- if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
+ if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
- && ( !defined(VBOX_OSE) \
- || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
-+ ifdef VBOX_PATH_MACOSX_SDK_10_6
++ && defined(VBOX_PATH_MACOSX_SDK_10_6)
++ && ("$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
endif
-- if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
+ if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
- && ( defined(VBOX_NOT_OSE_LATER_SOMETIME) \
- || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
-+ ifdef VBOX_PATH_MACOSX_SDK_10_7
++ && defined(VBOX_PATH_MACOSX_SDK_10_7)
++ && ("$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
endif
Deleted: trunk/dports/emulators/virtualbox/files/patch-configure.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-configure.diff 2012-09-17 01:02:08 UTC (rev 97825)
+++ trunk/dports/emulators/virtualbox/files/patch-configure.diff 2012-09-17 01:52:04 UTC (rev 97826)
@@ -1,49 +0,0 @@
---- configure.orig 2012-09-06 15:12:21.000000000 -0700
-+++ configure 2012-09-06 15:47:11.000000000 -0700
-@@ -1950,8 +1950,8 @@
- 12\.*)
- darwin_ver="10.8" # Mountain Lion
-
-- if { test -d "/Developer/SDKs/MacOSX10.7.sdk"; } then
-- sdk="/Developer/SDKs/MacOSX10.7.sdk"
-+ if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"; } then
-+ sdk="`xcode-select -print-path`/SDKs/MacOSX10.7.sdk"
- else
- sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
- fi
-@@ -1961,21 +1961,28 @@
- 11\.*)
- darwin_ver="10.7" # Lion
-
-- if { test -d "/Developer/SDKs/MacOSX10.6.sdk"; } then
-- sdk="/Developer/SDKs/MacOSX10.6.sdk"
-- else
-+ CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
-+
-+ if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"; } then
-+ # Developer tools are not bundled in Xcode.app
-+ sdk="`xcode-select -print-path`/SDKs/MacOSX10.6.sdk"
-+ elif { test -d "`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"; } then
-+ # Developer tools are in Xcode.app and there's 10.6 SDK
- sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
-+ else
-+ # Developer tools are in Xcode.app and there's no 10.6 SDK, i.e. we're on 10.7 using Xcode >4.4
-+ # that only sports 10.7 and 10.8, we need to change CXX_FLAGS too
-+ sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
-+ CXX_FLAGS="-mmacosx-version-min=10.7 -isysroot $sdk -Wl,-syslibroot,$sdk"
- fi
--
-- CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
- ;;
- 10\.*)
- darwin_ver="10.6" # Snow Leopard
-
- if [ "$BUILD_MACHINE" = "x86" ]; then
-
-- if { test -d "/Developer/SDKs/MacOSX10.5.sdk"; } then
-- sdk="/Developer/SDKs/MacOSX10.5.sdk"
-+ if { test -d "`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"; } then
-+ sdk="`xcode-select -print-path`/SDKs/MacOSX10.5.sdk"
- else
- sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk"
- fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120916/7ee65fdc/attachment-0001.html>
More information about the macports-changes
mailing list