Ignore:
Timestamp:
Apr 28, 2012, 4:31:32 AM (5 years ago)
Author:
ryandesign@…
Message:

pymol: update to 3996; add gcc47 variant; ensure we're UsingTheRightCompiler; see #33963

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/pymol/Portfile

    r91229 r92412  
    77name                pymol
    88version             1.5
     9revision            1
    910categories          science
    1011maintainers         bromo.med.uc.edu:howarth
     
    2122fetch.type          svn
    2223svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
    23 svn.revision        3983
     24svn.revision        3996
    2425worksrcdir          pymol
    2526
     
    3738use_parallel_build yes
    3839
    39 variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
     40variant gcc43 description conflicts gcc44 gcc45 gcc46 gcc47 description {build using macports-gcc-4.3} {
    4041    depends_lib-append  port:gcc43
    4142    python.add_archflags   no
     
    4344}
    4445
    45 variant gcc44 description conflicts gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {
     46variant gcc44 description conflicts gcc43 gcc45 gcc46 gcc47 description {build using macports-gcc-4.4} {
    4647    depends_lib-append  port:gcc44
    4748    python.add_archflags   no
     
    4950}
    5051
    51 variant gcc45 description conflicts gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {
     52variant gcc45 description conflicts gcc43 gcc44 gcc46 gcc47 description {build using macports-gcc-4.5} {
    5253    depends_lib-append  port:gcc45
    5354    python.add_archflags   no
     
    5556}
    5657
    57 variant gcc46 description conflicts gcc43 gcc44 gcc45 description {build using macports-gcc-4.6} {
     58variant gcc46 description conflicts gcc43 gcc44 gcc45 gcc47 description {build using macports-gcc-4.6} {
    5859    depends_lib-append  port:gcc46
    5960    python.add_archflags   no
     
    6162}
    6263
    63 pre-build {
    64     build.env CC="${configure.cc}" CXX="${configure.cxx}"
     64variant gcc47 description conflicts gcc43 gcc44 gcc45 gcc46 description {build using macports-gcc-4.7} {
     65    depends_lib-append  port:gcc47
     66    python.add_archflags   no
     67    configure.compiler  macports-gcc-4.7
    6568}
    6669
    6770build {
     71}
     72
     73pre-destroot {
     74        destroot.env CC="${configure.cc}" CXX="${configure.cxx}"
    6875}
    6976
Note: See TracChangeset for help on using the changeset viewer.