[112628] trunk/dports/math/octave-devel/Portfile

[michaelld at macports.org]

Revision: 112628
          https://trac.macports.org/changeset/112628
Author:   michaelld at macports.org
Date:     2013-10-28 07:10:27 -0700 (Mon, 28 Oct 2013)
Log Message:
-----------
octave-devel:
* rev-bump for new SuiteSparse;
* split C/C++ and Fortran compiler selection;
* set "gcc_default_no_dot" to make default +gccXY selection more robust.

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2013-10-28 14:09:37 UTC (rev 112627)
+++ trunk/dports/math/octave-devel/Portfile	2013-10-28 14:10:27 UTC (rev 112628)
@@ -7,7 +7,7 @@
 
 name                octave-devel
 version             3.6.4
-revision            8
+revision            9
 conflicts           octave
 categories          math science
 maintainers         michaelld openmaintainer
@@ -126,6 +126,7 @@
 }
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+set gcc_default "4.8"
 
 # create g95 variant, with full conflicts of GCC versions
 
@@ -162,9 +163,10 @@
 
     eval [subst {
         variant ${gcc_ver1_no_dot} ${gcc_conflicts} \
-            description "Build with the MacPorts ${gcc_ver1_no_dot} Toolchain" {
-                configure.compiler macports-gcc-${ver1}
-                configure.ldflags  -lgfortran
+            description "Build with the MacPorts ${gcc_ver1_no_dot} as the Fortran Compiler" {
+                configure.fc  ${prefix}/bin/gfortran-mp-${ver1}
+                configure.f77 ${prefix}/bin/gfortran-mp-${ver1}
+                configure.f90 ${prefix}/bin/gfortran-mp-${ver1}
             }
     }]
 }
@@ -183,8 +185,11 @@
     }
 }
 
+# check for need for default variant
+
+set gcc_default_no_dot gcc[join [split ${gcc_default} "."] ""]
 if {"${var_selection}" == ""} {
-    default_variants +gcc48
+    default_variants +${gcc_default_no_dot}
 }
 
 # check if the user disabled just the default variant
@@ -202,7 +207,7 @@
 }
 
 if {"${var_selection}" == ""} {
-    ui_error "\n\nYou cannot use the -gcc48 variant alone; a Fortran compiler is required.\n"
+    ui_error "\n\nYou cannot use the -${gcc_default_no_dot} variant alone; a Fortran compiler is required.\n"
     return -code error "Invalid variant selection"
 }
 
@@ -239,7 +244,9 @@
 
     depends_lib-append    port:atlas
     # NOTE: libtatlas does not work as of 3.10.1_5
-    configure.args-append --with-blas="-lcblas -lf77blas -latlas"
+    configure.args-append \
+        --with-blas="-lcblas -lf77blas -latlas" \
+        --with-lapack="-llapack -lgfortran"
 
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131028/43ba4e7b/attachment.html>