Ticket #49010: Portfile.diff

File Portfile.diff, 2.2 KB (added by howarth.at.macports@…, 9 years ago)

Use active_variants PortGroup rather than the compiler PortGroup to avoid blacklisting compilers.

  • Portfile

    old new  
    22# $Id: Portfile 134561 2015-03-30 08:46:40Z jeremyhu@macports.org $
    33
    44PortSystem          1.0
     5PortGroup           active_variants 1.1
    56
    67name                ccpnmr
    78version             2.4.2
    8 revision            1
     9revision            2
    910set branch          [join [lrange [split $version .] 0 1] .]
    1011categories          science python
    1112maintainers         gmail.com:howarth.at.macports
     
    7879    system "${python.bin} -O ${python.libdir}/compileall.py -d ${python.pkgd}/${name}/${name}${branch} ${destroot}${python.pkgd}/${name}/${name}${branch}"
    7980}
    8081
    81 variant gcc45 conflicts gcc46 gcc47 gcc48 gcc49 description {Build with GCC 4.5} {
     82variant gcc45 conflicts gcc46 gcc47 gcc48 gcc49 gcc5 description {Build with GCC 4.5} {
    8283    configure.compiler  macports-gcc-4.5
    8384    set lib ${prefix}/lib/gcc45
    8485}
    85 variant gcc46 conflicts gcc45 gcc47 gcc48 gcc49 description {Build with GCC 4.6} {
     86variant gcc46 conflicts gcc45 gcc47 gcc48 gcc49 gcc5 description {Build with GCC 4.6} {
    8687    configure.compiler  macports-gcc-4.6
    8788    set lib ${prefix}/lib/gcc46
    8889}
    89 variant gcc47 conflicts gcc45 gcc46 gcc48 gcc49 description {Build with GCC 4.7} {
     90variant gcc47 conflicts gcc45 gcc46 gcc48 gcc49 gcc5 description {Build with GCC 4.7} {
    9091    configure.compiler  macports-gcc-4.7
    9192    set lib ${prefix}/lib/gcc47
    9293}
    93 variant gcc48 conflicts gcc45 gcc46 gcc47 gcc49 description {Build with GCC 4.8} {
     94variant gcc48 conflicts gcc45 gcc46 gcc47 gcc49 gcc5 description {Build with GCC 4.8} {
    9495    configure.compiler  macports-gcc-4.8
    9596    set lib ${prefix}/lib/gcc48
    9697}
    97 variant gcc49 conflicts gcc45 gcc46 gcc47 gcc48 description {Build with GCC 4.9} {
     98variant gcc49 conflicts gcc45 gcc46 gcc47 gcc48 gcc5 description {Build with GCC 4.9} {
    9899    configure.compiler  macports-gcc-4.9
    99100    set lib ${prefix}/lib/gcc49
    100101}
    101 
    102 if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc48] && ![variant_isset gcc49]} {
    103     default_variants    +gcc48
     102variant gcc5 conflicts gcc45 gcc46 gcc47 gcc48 gcc49 description {Build with GCC 5} {
     103    configure.compiler  macports-gcc-5
     104    set lib ${prefix}/lib/gcc5
    104105}