Ticket #40316: Portfile.patch

File Portfile.patch, 1.9 KB (added by ds283 (David Seery), 11 years ago)

portfile diff

  • Portfile

    old new  
    8686
    8787set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
    8888set default_fortran_variant +gcc48
    89 set g95_conflicts {}
     89set g95_conflicts {ifort}
     90set ifort_conflicts {g95}
    9091
    9192foreach ver ${gcc_versions} {
    9293    set ver_no_dot [join [split ${ver} "."] ""]
    9394
    94     set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
     95    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95 ifort}
    9596
    9697    foreach over ${gcc_versions} {
    9798        if {${ver} == ${over}} {
     
    106107    eval $variant_line
    107108
    108109    append g95_conflicts " conflicts gcc${ver_no_dot}"
     110    append ifort_conflicts " conflicts gcc${ver_no_dot}"
    109111
    110112    if {[variant_isset gcc${ver_no_dot}]} {
    111113        if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
     
    116118
    117119eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
    118120
     121eval [concat {variant ifort description {build with Intel IFORT}} $ifort_conflicts {{}}]
     122
    119123if {[variant_isset g95]} {
    120124    if {${default_fortran_variant} != "+g95"} {
    121125        set default_fortran_variant ""
    122126    }
    123127}
    124128
     129if {[variant_isset ifort]} {
     130    if {${default_fortran_variant} != "+ifort"} {
     131        set default_fortran_variant ""
     132    }
     133}
     134
    125135if {${default_fortran_variant} != ""} {
    126136    default_variants "${default_fortran_variant}"
    127137}
     
    148158    configure.f90 ${prefix}/bin/g95
    149159}
    150160
     161if {[variant_isset ifort]} {
     162    configure.fc /usr/bin/ifort
     163    configure.f77 /usr/bin/ifort
     164    configure.f90 /usr/bin/ifort
     165}
     166
    151167livecheck.type  regex
    152168livecheck.url   http://www.open-mpi.org/software/ompi/v1.7/
    153169livecheck.regex openmpi-(\[0-9\.\]+).tar.bz2