Ticket #38192: update-2.diff

File update-2.diff, 2.0 KB (added by pkgw (Peter Williams), 11 years ago)

update-2: support gcc 4.7 instead of 4.4, and make 4.7 the default

  • ports/science/miriad/Portfile

    commit 6baa50d3c86e495b778c939aabafbaae69ab3251
    Author: Peter Williams <peter@newton.cx>
    Date:   Sun Feb 24 13:57:23 2013 -0800
    
        Portfile: support gcc 4.7, and default to using it
    
    diff --git a/ports/science/miriad/Portfile b/ports/science/miriad/Portfile
    index 2b06587..5315548 100644
    a b if {[variant_isset carma]} { 
    5858# to build with better-optimizing proprietary compilers, which we allow
    5959# via the gcc_select mechanism.
    6060
    61 variant gcc44 conflicts gcc45 gcc46 gcc_select description {Build with gcc/gfortran 4.4} {
    62     configure.compiler  macports-gcc-4.4
    63     depends_lib-append  port:gcc44
    64 }
    65 
    66 variant gcc45 conflicts gcc44 gcc46 gcc_select description {Build with gcc/gfortran 4.5} {
     61variant gcc45 conflicts gcc46 gcc47 gcc_select description {Build with gcc/gfortran 4.5} {
    6762    configure.compiler  macports-gcc-4.5
    6863    depends_lib-append  port:gcc45
    6964}
    7065
    71 variant gcc46 conflicts gcc44 gcc45 gcc_select description {Build with gcc/gfortran 4.6} {
     66variant gcc46 conflicts gcc45 gcc47 gcc_select description {Build with gcc/gfortran 4.6} {
    7267    configure.compiler  macports-gcc-4.6
    7368    depends_lib-append  port:gcc46
    7469}
    7570
    76 variant gcc_select conflicts gcc44 gcc45 gcc46 description {Build with compilers chosen via gcc_select -- experts only} {
     71variant gcc47 conflicts gcc45 gcc46 gcc_select description {Build with gcc/gfortran 4.7} {
     72    configure.compiler  macports-gcc-4.7
     73    depends_lib-append  port:gcc47
     74}
     75
     76variant gcc_select conflicts gcc45 gcc46 gcc47 description {Build with compilers chosen via gcc_select -- experts only} {
    7777    configure.compiler  macports-gcc
    7878    depends_lib-append  port:gcc_select
    7979}
    8080
    81 if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc_select]} {
    82     default_variants +gcc45
     81if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc_select]} {
     82    default_variants +gcc47
    8383}
    8484
    8585universal_variant    no