[88317] trunk/dports/python/py-numpy/Portfile

[ram at macports.org]

Revision: 88317
          http://trac.macports.org/changeset/88317
Author:   ram at macports.org
Date:     2011-12-28 04:21:13 -0800 (Wed, 28 Dec 2011)
Log Message:
-----------
python/py-numpy: add gcc46 variant (#32669)

Modified Paths:
--------------
    trunk/dports/python/py-numpy/Portfile

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2011-12-28 12:21:05 UTC (rev 88316)
+++ trunk/dports/python/py-numpy/Portfile	2011-12-28 12:21:13 UTC (rev 88317)
@@ -62,22 +62,28 @@
     # compiler; if not, either use what the user set (as +gcc4X) or
     # default to gcc44.
 
-    variant gcc43 conflicts gcc44 gcc45 \
+    variant gcc43 conflicts gcc44 gcc45 gcc46 \
     description {Use the gcc43 compiler (enables fortran linking)} {
         configure.compiler  macports-gcc-4.3
     }
 
-    variant gcc44 conflicts gcc43 gcc45 \
+    variant gcc44 conflicts gcc43 gcc45 gcc46 \
     description {Use the gcc44 compiler (enables fortran linking)} {
         configure.compiler  macports-gcc-4.4
     }
 
-    variant gcc45 conflicts gcc43 gcc44 \
+    variant gcc45 conflicts gcc43 gcc44 gcc46 \
     description {Use the gcc45 compiler (enables fortran linking)} {
         configure.compiler  macports-gcc-4.5
     }
 
-    if {![variant_isset gcc43] && ![variant_isset gcc45]} {
+    variant gcc46 conflicts gcc43 gcc44 gcc45 \
+    description {Use the gcc46 compiler (enables fortran linking)} {
+        configure.compiler  macports-gcc-4.6
+    }
+
+
+    if {![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
         default_variants +gcc44
     }
     if {[variant_isset gcc43]} {
@@ -86,8 +92,11 @@
         set gcc_version "4.4"
     } elseif {[variant_isset gcc45]} {
         set gcc_version "4.5"
+    } elseif {[variant_isset gcc46]} {
+        set gcc_version "4.6"
     }
 
+
     # when using non-Apple GCC for universal install, it can
     # create binaries only for the native OS architecture, at
     # either 32 or 64 bits.  Restrict the supported archs
@@ -144,6 +153,10 @@
             set CC  "${prefix}/bin/gcc-mp-4.5"
             set CXX "${prefix}/bin/g++-mp-4.5"
             set F90 "${prefix}/bin/gfortran-mp-4.5"
+        } elseif {[variant_isset gcc46]} {
+            set CC  "${prefix}/bin/gcc-mp-4.6"
+            set CXX "${prefix}/bin/g++-mp-4.6"
+            set F90 "${prefix}/bin/gfortran-mp-4.6"
         }
 
         reinplace   "s|@@@|${CC}|" ${worksrcpath}/c-wrapper
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111228/c8d786dc/attachment.html>