Ticket #32669: numpy-gcc46.diff

File numpy-gcc46.diff, 2.0 KB (added by miles@…, 13 years ago)
  • Portfile

    old new  
    6262    # compiler; if not, either use what the user set (as +gcc4X) or
    6363    # default to gcc44.
    6464
    65     variant gcc43 conflicts gcc44 gcc45 \
     65    variant gcc43 conflicts gcc44 gcc45 gcc46 \
    6666    description {Use the gcc43 compiler (enables fortran linking)} {
    6767        configure.compiler  macports-gcc-4.3
    6868    }
    6969
    70     variant gcc44 conflicts gcc43 gcc45 \
     70    variant gcc44 conflicts gcc43 gcc45 gcc46 \
    7171    description {Use the gcc44 compiler (enables fortran linking)} {
    7272        configure.compiler  macports-gcc-4.4
    7373    }
    7474
    75     variant gcc45 conflicts gcc43 gcc44 \
     75    variant gcc45 conflicts gcc43 gcc44 gcc46 \
    7676    description {Use the gcc45 compiler (enables fortran linking)} {
    7777        configure.compiler  macports-gcc-4.5
    7878    }
    7979
    80     if {![variant_isset gcc43] && ![variant_isset gcc45]} {
     80    variant gcc46 conflicts gcc43 gcc44 gcc45 \
     81    description {Use the gcc46 compiler (enables fortran linking)} {
     82        configure.compiler  macports-gcc-4.6
     83    }
     84
     85
     86    if {![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
    8187        default_variants +gcc44
    8288    }
    8389    if {[variant_isset gcc43]} {
     
    8692        set gcc_version "4.4"
    8793    } elseif {[variant_isset gcc45]} {
    8894        set gcc_version "4.5"
    89     }
     95    } elseif {[variant_isset gcc46]} {
     96        set gcc_version "4.6"
     97    }
     98
    9099
    91100    # when using non-Apple GCC for universal install, it can
    92101    # create binaries only for the native OS architecture, at
     
    144153            set CC  "${prefix}/bin/gcc-mp-4.5"
    145154            set CXX "${prefix}/bin/g++-mp-4.5"
    146155            set F90 "${prefix}/bin/gfortran-mp-4.5"
     156        } elseif {[variant_isset gcc46]} {
     157            set CC  "${prefix}/bin/gcc-mp-4.6"
     158            set CXX "${prefix}/bin/g++-mp-4.6"
     159            set F90 "${prefix}/bin/gfortran-mp-4.6"
    147160        }
    148161
    149162        reinplace   "s|@@@|${CC}|" ${worksrcpath}/c-wrapper