[91218] trunk/dports/x11/mesa/Portfile

[ryandesign at macports.org]

Revision: 91218
          https://trac.macports.org/changeset/91218
Author:   ryandesign at macports.org
Date:     2012-03-25 22:33:23 -0700 (Sun, 25 Mar 2012)
Log Message:
-----------
mesa: simplify setting the compiler to gcc-4.2 on Leopard

Modified Paths:
--------------
    trunk/dports/x11/mesa/Portfile

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2012-03-26 04:50:34 UTC (rev 91217)
+++ trunk/dports/x11/mesa/Portfile	2012-03-26 05:33:23 UTC (rev 91218)
@@ -45,13 +45,6 @@
 build.args-append INSTALL_DIR=${prefix}
 destroot.args-append INSTALL_DIR=${prefix}
 
-# Ensure correct compilers are used in Makefiles.
-if {${os.platform} == "darwin" && ${os.major} == 9} {
-    # http://trac.macports.org/ticket/24345
-    configure.cc /usr/bin/gcc-4.2
-    configure.cxx /usr/bin/g++-4.2
-}
-
 variant universal {}
 build.args-append RC_CFLAGS="[get_canonical_archflags]"
 
@@ -61,9 +54,6 @@
 }
 
 configure.cppflags-delete -I${prefix}/include
-build.args-append \
-    CC="${configure.cc} ${configure.cppflags}" \
-    CXX="${configure.cxx} ${configure.cppflags}"
 
 post-extract {
     if {! [file exists "${worksrcpath}/configs/current"]} {
@@ -85,6 +75,12 @@
     }
 }
 
+pre-build {
+    build.args-append \
+        CC="${configure.cc} ${configure.cppflags}" \
+        CXX="${configure.cxx} ${configure.cppflags}"
+}
+
 variant iglx description {Install a libGL that uses your X11 server's indirect GLX path for rendering (the default is off which allows libGL to accelerate rendering using OpenGL.framework)} {
     patchfiles-append iglx.patch
 }
@@ -130,6 +126,11 @@
     }
 }
 
+platform darwin 9 {
+    # https://trac.macports.org/ticket/24345
+    configure.compiler gcc-4.2
+}
+
 livecheck.type  regex
 livecheck.url   http://www.mesa3d.org/news.html
 livecheck.regex {relnotes-([0-9.]+)\.html}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120325/3d36c48d/attachment.html>