Changeset 112628


Ignore:
Timestamp:
Oct 28, 2013, 2:10:27 PM (6 years ago)
Author:
michaelld@…
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.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/octave-devel/Portfile

    r110134 r112628  
    88name                octave-devel
    99version             3.6.4
    10 revision            8
     10revision            9
    1111conflicts           octave
    1212categories          math science
     
    127127
    128128set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
     129set gcc_default "4.8"
    129130
    130131# create g95 variant, with full conflicts of GCC versions
     
    163164    eval [subst {
    164165        variant ${gcc_ver1_no_dot} ${gcc_conflicts} \
    165             description "Build with the MacPorts ${gcc_ver1_no_dot} Toolchain" {
    166                 configure.compiler macports-gcc-${ver1}
    167                 configure.ldflags  -lgfortran
     166            description "Build with the MacPorts ${gcc_ver1_no_dot} as the Fortran Compiler" {
     167                configure.fc  ${prefix}/bin/gfortran-mp-${ver1}
     168                configure.f77 ${prefix}/bin/gfortran-mp-${ver1}
     169                configure.f90 ${prefix}/bin/gfortran-mp-${ver1}
    168170            }
    169171    }]
     
    184186}
    185187
     188# check for need for default variant
     189
     190set gcc_default_no_dot gcc[join [split ${gcc_default} "."] ""]
    186191if {"${var_selection}" == ""} {
    187     default_variants +gcc48
     192    default_variants +${gcc_default_no_dot}
    188193}
    189194
     
    203208
    204209if {"${var_selection}" == ""} {
    205     ui_error "\n\nYou cannot use the -gcc48 variant alone; a Fortran compiler is required.\n"
     210    ui_error "\n\nYou cannot use the -${gcc_default_no_dot} variant alone; a Fortran compiler is required.\n"
    206211    return -code error "Invalid variant selection"
    207212}
     
    240245    depends_lib-append    port:atlas
    241246    # NOTE: libtatlas does not work as of 3.10.1_5
    242     configure.args-append --with-blas="-lcblas -lf77blas -latlas"
     247    configure.args-append \
     248        --with-blas="-lcblas -lf77blas -latlas" \
     249        --with-lapack="-llapack -lgfortran"
    243250
    244251}
Note: See TracChangeset for help on using the changeset viewer.