[86992] trunk/dports/emulators/virtualbox

[royliu at macports.org]

Revision: 86992
          http://trac.macports.org/changeset/86992
Author:   royliu at macports.org
Date:     2011-11-07 13:40:37 -0800 (Mon, 07 Nov 2011)
Log Message:
-----------
virtualbox: set the c and c++ compilers as configure flags

Modified Paths:
--------------
    trunk/dports/emulators/virtualbox/Portfile
    trunk/dports/emulators/virtualbox/files/patch-build.diff

Modified: trunk/dports/emulators/virtualbox/Portfile
===================================================================
--- trunk/dports/emulators/virtualbox/Portfile	2011-11-07 21:37:13 UTC (rev 86991)
+++ trunk/dports/emulators/virtualbox/Portfile	2011-11-07 21:40:37 UTC (rev 86992)
@@ -42,8 +42,8 @@
                     sha1    19a801444102a10d2b62ab35daacb7ddc415bab0 \
                     rmd160  1bf368464ac0d431ac799e4710835f3426a9a5f6
 
-depends_lib-append          port:libidl \
-                            port:curl \
+depends_lib-append          port:curl \
+                            port:libidl \
                             path:lib/pkgconfig/libxml-2.0.pc:libxml2 \
                             path:lib/pkgconfig/libxslt.pc:libxslt \
                             path:lib/pkgconfig/openssl.pc:openssl \
@@ -56,12 +56,10 @@
 configure.pre_args-delete   --prefix=${prefix}
 
 configure.args              --with-qt-dir=${prefix} \
-                            --with-openssl-dir=${prefix}
+                            --with-openssl-dir=${prefix} \
+                            --with-gcc=${prefix}/bin/gcc-apple-4.2 \
+                            --with-g++=${prefix}/bin/g++-apple-4.2
 
-if {${macosx_deployment_target} == "10.7"} {
-    configure.args-append   --disable-opengl
-}
-
 # VirtualBox uses kBuild.
 build.cmd                   ". env.sh && kmk"
 
@@ -75,12 +73,10 @@
 
     reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" \
         ${worksrcpath}/LocalConfig.kmk
-    reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|${macosx_deployment_target}|g" \
-        ${worksrcpath}/LocalConfig.kmk
-    reinplace "s|@CONFIGURE\\.CC@|${configure.cc}|g" \
-        ${worksrcpath}/configure
-    reinplace "s|@CONFIGURE\\.CXX@|${configure.cxx}|g" \
-        ${worksrcpath}/configure
+#   TODO: The deployment target should be set dynamically, but, because of incompatibilities with OpenGL headers in
+#   10.7, it's fixed at 10.6 for now.
+    reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|10.6|g" \
+       ${worksrcpath}/LocalConfig.kmk
     reinplace "s|@KEXT_DIR@|${prefix}${kext_dir}|g" \
         ${worksrcpath}/src/VBox/Installer/darwin/VBoxStartupItems/VirtualBox/VirtualBox
 

Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff	2011-11-07 21:37:13 UTC (rev 86991)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff	2011-11-07 21:40:37 UTC (rev 86992)
@@ -189,28 +189,6 @@
  #
 --- configure.orig	2011-08-15 19:38:16.000000000 -0500
 +++ configure	2011-08-15 19:38:16.000000000 -0500
-@@ -96,10 +96,10 @@
- BUILD_LIBCURL=
- BUILD_LIBSSL=
- PASSIVE_MESA=0
--CC="gcc"
-+CC="@CONFIGURE.CC@"
- CC32=""
- CC64=""
--CXX="g++"
-+CXX="@CONFIGURE.CXX@"
- 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()
  {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111107/6f00df05/attachment-0001.html>