Ticket #28346: Portfile.diff

Portfile

@@ -54 +54 @@
 # the +atlas variant) ...
 set gcc_version ""
 if {[variant_isset atlas]} {
-    universal_variant no
 
     # see if the user has set -gcc4X to disable using MacPorts'
     # compiler; if not, either use what the user set (as +gcc4X) or
     # default to gcc44.
 
     variant gcc43 conflicts gcc44 gcc45 \
-    description {Use the gcc43 compiler (enables fortran linking)} {}
+    description {Use the gcc43 compiler (enables fortran linking)} {
+        configure.compiler      macports-gcc-4.3
+    }
 
     variant gcc44 conflicts gcc43 gcc45 \
-    description {Use the gcc44 compiler (enables fortran linking)} {}
+    description {Use the gcc44 compiler (enables fortran linking)} {
+        configure.compiler      macports-gcc-4.4
+    }
 
     variant gcc45 conflicts gcc43 gcc44 \
-    description {Use the gcc45 compiler (enables fortran linking)} {}
+    description {Use the gcc45 compiler (enables fortran linking)} {
+        configure.compiler      macports-gcc-4.5
+    }
 
     if {![variant_isset gcc43] && ![variant_isset gcc45]} {
         default_variants +gcc44
@@ -115 +120 @@
     reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
         ${worksrcpath}/numpy/f2py/setup.py
 
-    # disallow searching for any fortran executable except what is
-    # specified in this Portfile; NOTE: this change only works when
-    # setting the GCC version; if this flag is not set (meaning no
-    # +gcc4X variant is set), then F2PY may or not work.
-    if {${gcc_version} != ""} {
-        # set which fortran to use in the f2py Python scripts
-        reinplace "/possible_executables/s|\\\[.*\\\]|\['gfortran-mp-${gcc_version}'\]|g" ${worksrcpath}/numpy/distutils/fcompiler/gnu.py
-    }
+        if {[variant_isset universal] && [variant_isset atlas]} {
+                # Prepare wrappers
+                file copy -force ${filespath}/wrapper-template \
+                        ${worksrcpath}/c-wrapper
+                file copy -force ${filespath}/wrapper-template \
+                        ${worksrcpath}/f-wrapper
+                file copy -force ${filespath}/wrapper-template \
+                        ${worksrcpath}/cxx-wrapper
+
+                if {[variant_isset gcc43]} {
+                        set CC  "${prefix}/bin/gcc-mp-4.3"
+                        set CXX "${prefix}/bin/g++-mp-4.3"
+                        set F90 "${prefix}/bin/gfortran-mp-4.3"
+                } elseif {[variant_isset gcc44]} {
+                        set CC  "${prefix}/bin/gcc-mp-4.4"
+                        set CXX "${prefix}/bin/g++-mp-4.4"
+                        set F90 "${prefix}/bin/gfortran-mp-4.4"
+                } elseif {[variant_isset gcc45]} {
+                        set CC  "${prefix}/bin/gcc-mp-4.5"
+                        set CXX "${prefix}/bin/g++-mp-4.5"
+                        set F90 "${prefix}/bin/gfortran-mp-4.5"
+                }
+        
+                reinplace       "s|@@@|${CC}|" ${worksrcpath}/c-wrapper
+                reinplace       "s|---|\\\\.c|" ${worksrcpath}/c-wrapper
+                reinplace       "s|&&&|${prefix}|" ${worksrcpath}/c-wrapper
+                
+                reinplace       "s|@@@|${CXX}|" ${worksrcpath}/cxx-wrapper
+                reinplace       "s#---#(\\\\.C|\\\\.cpp|\\\\.cc)#" \
+                        ${worksrcpath}/cxx-wrapper
+                reinplace       "s|&&&|${prefix}|" ${worksrcpath}/cxx-wrapper
+                
+                reinplace       "s|@@@|${F90}|" ${worksrcpath}/f-wrapper
+                reinplace       "s|---|\\\\.f|" ${worksrcpath}/f-wrapper
+                reinplace       "s|&&&|${prefix}|" ${worksrcpath}/f-wrapper
+
+                build.env-append        CC="${worksrcpath}/c-wrapper" \
+                                                        CXX="${worksrcpath}/cxx-wrapper" \
+                                                        F77="${worksrcpath}/f-wrapper" \
+                                                        F90="${worksrcpath}/f-wrapper"
+
+                destroot.env-append     CC="${worksrcpath}/c-wrapper" \
+                                                        CXX="${worksrcpath}/cxx-wrapper" \
+                                                        F77="${worksrcpath}/f-wrapper" \
+                                                        F90="${worksrcpath}/f-wrapper"
+        }
 }
 
 livecheck.type  regex