Ticket #49267: patch-atlas-gcc5.diff

File patch-atlas-gcc5.diff, 3.5 KB (added by seanfarley (Sean Farley), 9 years ago)
  • dports/math/atlas/Portfile

    # HG changeset patch
    # User Sean Farley <sean@farley.io>
    # Date 1444516928 25200
    #      Sat Oct 10 15:42:08 2015 -0700
    # Node ID ecc5446d1850f108b81b6d5d517dff23e680c9e2
    # Parent  d25a9e7248e550692a63b5ae460a2bbc23d407cb
    atlas: add gcc5 variant
    
    diff --git a/dports/math/atlas/Portfile b/dports/math/atlas/Portfile
    a b checksums atlas3.10.2.tar.bz2  
    5252worksrcdir          ATLAS
    5353
    5454set     gcc_version 0
    5555set     use_clang   ""
    5656
    57 variant gcc49       conflicts   gcc47 gcc48 clang mpclang34 perf\
     57variant gcc5        conflicts   gcc47 gcc48 gcc49 clang mpclang34 perf\
     58                    description {build using macports-gcc-5} {
     59
     60    configure.compiler      macports-gcc-5
     61}
     62
     63if {[variant_isset gcc5]} {
     64
     65    set gcc_version 5
     66    set use_clang   ""
     67
     68}
     69
     70variant gcc49       conflicts   gcc47 gcc48 gcc5 clang mpclang34 perf\
    5871                    description {build using macports-gcc-4.9} {
    5972
    6073    configure.compiler      macports-gcc-4.9
    6174}
    6275
    if {[variant_isset gcc49]} { 
    6578    set gcc_version 49
    6679    set use_clang   ""
    6780
    6881}
    6982
    70 variant gcc48            conflicts   gcc47 gcc49 clang mpclang34 perf \
     83variant gcc48            conflicts   gcc47 gcc49 gcc5 clang mpclang34 perf \
    7184                         description {build using macports-gcc-4.8} {
    7285
    7386    configure.compiler      macports-gcc-4.8
    7487}
    7588
    if {[variant_isset gcc48]} { 
    7790
    7891    set gcc_version 48
    7992    set use_clang   ""
    8093}
    8194
    82 variant gcc47       conflicts   gcc48 gcc49 clang mpclang34 perf \
     95variant gcc47       conflicts   gcc48 gcc49 gcc5 clang mpclang34 perf \
    8396                    description {build using macports-gcc-4.7} {
    8497
    8598    configure.compiler      macports-gcc-4.7
    8699}
    87100
    if {[variant_isset gcc47]} { 
    90103    set gcc_version 47
    91104    set use_clang   ""
    92105}
    93106
    94107
    95 variant clang       conflicts   gcc47 gcc48 gcc49 mpclang34 \
     108variant clang       conflicts   gcc47 gcc48 gcc49 gcc5 mpclang34 \
    96109                    description {use XCode clang and gfortran} {
    97110
    98111    pre-fetch {
    99112        if {[vercmp ${xcodeversion} 5.0] < 0} {
    100113            return -code error    "This clang version is not supported.\
    if {[variant_isset clang]} { 
    109122
    110123    set use_clang   "XCode"
    111124    set gcc_version 0
    112125}
    113126
    114 variant mpclang34   conflicts   gcc47 gcc48 gcc49 clang perf\
     127variant mpclang34   conflicts   gcc47 gcc48 gcc49 gcc5 clang perf\
    115128                    description {use mp-clang-3.4 and gfortran} {
    116129
    117130    configure.compiler      macports-clang-3.4
    118131}
    119132
    if {[variant_isset mpclang34]} { 
    121134
    122135    set use_clang   "34"
    123136    set gcc_version 0
    124137}
    125138
    126 variant perf conflicts gcc47 gcc48 gcc49 mpclang34 clang \
     139variant perf conflicts gcc47 gcc48 gcc49 gcc5 mpclang34 clang \
    127140             description {Uses clang-mp-3.4 for C and dragonegg-3.4 for Fortran} {
    128141
    129142    if {[vercmp ${xcodeversion} 5.0] < 0} {
    130143        configure.compiler      macports-clang-3.4
    131144    } else {
    if {(${os.major} > 10 && \ 
    184197
    185198# If none of the above variants is chosen, make gcc47 the default for
    186199# up to SSE4.2 (Core i1) capable processors, and XCode-clang for newer
    187200
    188201if {![variant_isset gcc47] && ![variant_isset gcc48] && \
    189     ![variant_isset gcc49] && ![variant_isset clang] && \
     202    ![variant_isset gcc49] && ![variant_isset gcc5] && \
     203    ![variant_isset clang] && \
    190204    ![variant_isset perf] && ![variant_isset mpclang34]} {
    191205
    192206    if {${has_avx} == "no"} {
    193207   
    194208        # Defaults to gcc47