Ticket #27849: gcc45.diff

File gcc45.diff, 1.8 KB (added by pkgw (Peter Williams), 14 years ago)

Patch to replace +gcc43 variant with +gcc45 and make it the default.

  • ports/science/miriad/Portfile

    commit 086b139de97070383ae24494f907961db875729e
    Author: Peter Williams <peter@newton.cx>
    Date:   Mon Jan 24 19:41:49 2011 -0800
    
        Allow and default to GCC 4.5.
    
    diff --git a/ports/science/miriad/Portfile b/ports/science/miriad/Portfile
    index c29d343..aed288c 100644
    a b if {[variant_isset carma]} { 
    5252# to build with better-optimizing proprietary compilers, which we allow
    5353# via the gcc_select mechanism.
    5454
    55 variant gcc43 conflicts gcc44 gcc_select description {Build with gcc 4.3} {
    56     configure.compiler  macports-gcc-4.3
    57     depends_lib-append  port:gcc43
     55variant gcc45 conflicts gcc44 gcc_select description {Build with gcc 4.5} {
     56    configure.compiler  macports-gcc-4.5
     57    depends_lib-append  port:gcc45
    5858}
    5959
    60 variant gcc44 conflicts gcc43 gcc_select description {Build with gcc 4.4} {
     60variant gcc44 conflicts gcc45 gcc_select description {Build with gcc 4.4} {
    6161    configure.compiler  macports-gcc-4.4
    6262    depends_lib-append  port:gcc44
    6363}
    6464
    65 variant gcc_select conflicts gcc43 gcc44 description {Build with compilers chosen via gcc_select -- experts only} {
     65variant gcc_select conflicts gcc45 gcc44 description {Build with compilers chosen via gcc_select -- experts only} {
    6666    # Setting the compiler to vanilla "gcc" prevents MacPorts from
    6767    # trying to get fancy with the flags, which probably won't work
    6868    # with the user's special compiler.
    variant gcc_select conflicts gcc43 gcc44 description {Build with compilers chose 
    7676    depends_lib-append  port:gcc_select
    7777}
    7878
    79 if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc_select]} {
    80     default_variants +gcc44
     79if {![variant_isset gcc45] && ![variant_isset gcc44] && ![variant_isset gcc_select]} {
     80    default_variants +gcc45
    8181}
    8282
    8383universal_variant    no