Ticket #35071: Portfile.diff

File Portfile.diff, 3.7 KB (added by mndavidoff (Monte Davidoff), 12 years ago)
  • Portfile

    old new  
    6060                            BLAS=${prefix}/lib
    6161}
    6262
    63 variant gcc42 conflicts gcc43 gcc44 gcc45 gcc46 description "Use gcc 4.2 tool chain for building" {
     63variant gcc42 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 description "Use gcc 4.2 tool chain for building" {
    6464  configure.compiler    macports-gcc-4.2
    6565  depends_lib-append    port:gcc42
    6666  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
     
    7474                        CXX="${prefix}/bin/g++-mp-4.2"
    7575}
    7676
    77 variant gcc43 conflicts gcc42 gcc44 gcc45 gcc46 description "Use gcc 4.3 tool chain for building" {
     77variant gcc43 conflicts gcc42 gcc44 gcc45 gcc46 gcc47 description "Use gcc 4.3 tool chain for building" {
    7878  configure.compiler    macports-gcc-4.3
    7979  depends_lib-append    port:gcc43
    8080  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
     
    8888                        CXX="${prefix}/bin/g++-mp-4.3"
    8989}
    9090
    91 variant gcc44 conflicts gcc42 gcc43 gcc45 gcc46 description "Use gfortran-mp-4.4 as fortran compiler" {
     91variant gcc44 conflicts gcc42 gcc43 gcc45 gcc46 gcc47 description "Use gfortran-mp-4.4 as fortran compiler" {
    9292  configure.compiler    macports-gcc-4.4
    9393  depends_lib-append    port:gcc44
    9494  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.4 --f90exec ${prefix}/bin/gfortran-mp-4.4"
     
    102102                        CXX="${prefix}/bin/g++-mp-4.4"
    103103}
    104104
    105 variant gcc45 conflicts gcc42 gcc43 gcc44 gcc46 description "Use gfortran-mp-4.5 as fortran compiler" {
     105variant gcc45 conflicts gcc42 gcc43 gcc44 gcc46 gcc47 description "Use gfortran-mp-4.5 as fortran compiler" {
    106106  configure.compiler    macports-gcc-4.5
    107107  depends_lib-append    port:gcc45
    108108  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.5 --f90exec ${prefix}/bin/gfortran-mp-4.5"
     
    116116                        CXX="${prefix}/bin/g++-mp-4.5"
    117117}
    118118
    119 variant gcc46 conflicts gcc42 gcc43 gcc44 gcc45 description "Use gfortran-mp-4.6 as fortran compiler" {
     119variant gcc46 conflicts gcc42 gcc43 gcc44 gcc45 gcc47 description "Use gfortran-mp-4.6 as fortran compiler" {
    120120  configure.compiler    macports-gcc-4.6
    121121  depends_lib-append    port:gcc46
    122122  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.6 --f90exec ${prefix}/bin/gfortran-mp-4.6"
     
    130130                        CXX="${prefix}/bin/g++-mp-4.6"
    131131}
    132132
     133variant gcc47 conflicts gcc42 gcc43 gcc44 gcc45 gcc46 description "Use gfortran-mp-4.7 as fortran compiler" {
     134  configure.compiler    macports-gcc-4.7
     135  depends_lib-append    port:gcc47
     136  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.7 --f90exec ${prefix}/bin/gfortran-mp-4.7"
     137  set config_options    "config --cc ${prefix}/bin/gcc-mp-4.7 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
     138  build.cmd-append      ${fc_options} ${config_options}
     139  destroot.cmd-append   ${fc_options} ${config_options}
     140
     141  destroot.env-append   CC="${prefix}/bin/gcc-mp-4.7" \
     142                        CXX="${prefix}/bin/g++-mp-4.7"
     143  build.env-append      CC="${prefix}/bin/gcc-mp-4.7" \
     144                        CXX="${prefix}/bin/g++-mp-4.7"
     145}
     146
    133147
    134 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] &![variant_isset gcc46] } {
     148if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc46] && ![variant_isset gcc47] } {
    135149  default_variants      +gcc45
    136150}
    137151