Ticket #48528: gcc5.5.0.patch

File gcc5.5.0.patch, 1.3 KB (added by nortcele, 7 years ago)

Patch to use if proposition to add ecj to gcc5.5.0 is accepted

  • Portfile

    old new  
    6868        ${destroot}${prefix}/share/man/man1
    6969}
    7070
    71 variant gcc45 conflicts gcc47 description {Build using gcc45} {
     71variant gcc45 conflicts gcc47 gcc5 description {Build using gcc45} {
    7272    configure.compiler  macports-gcc-4.5
    7373    set versuff         -mp-4.5
    7474}
    7575
    76 variant gcc47 conflicts gcc45 description {Build using gcc47} {
     76variant gcc47 conflicts gcc45 gcc5 description {Build using gcc47} {
    7777    configure.compiler  macports-gcc-4.7
    7878    set versuff         -mp-4.7
    7979}
    8080
    81 if {![variant_isset gcc45] && ![variant_isset gcc47]} {
    82     default_variants    +gcc47
     81variant gcc5 conflicts gcc45 gcc47 description {Build using gcc5} {
     82    configure.compiler  macports-gcc-5
     83    set versuff         -mp-5
    8384}
    8485
    85 platform darwin {
    86     pre-fetch {
    87         if {${os.major} > 14} {
    88             ui_error "${subport} currently does not build on OS X 10.11 or greater."
    89             ui_error "See https://trac.macports.org/ticket/48528"
    90             return -code error "incompatible OS X version"
    91         }
    92     }
     86if {![variant_isset gcc45] && ![variant_isset gcc47] && ![variant_isset gcc5]} {
     87    default_variants    +gcc5
    9388}
    9489
    9590livecheck.type          regex