Ticket #30331: pymol-configure.compiler.diff

File pymol-configure.compiler.diff, 1.8 KB (added by ryandesign (Ryan Carsten Schmidt), 13 years ago)

proposed patch

  • Portfile

     
    3737
    3838use_parallel_build yes
    3939
    40 platform darwin 11 {
    41     python.add_archflags   no
    42     build.env CC="/usr/bin/clang" CXX="/usr/bin/clang++"
     40if {${configure.compiler} == "llvm-gcc-4.2"} {
     41    configure.compiler  clang
    4342}
    4443
    4544variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
    4645    depends_lib-append  port:gcc43
    4746    python.add_archflags   no
    48     build.env CC="${prefix}/bin/gcc-mp-4.3" CXX="${prefix}/bin/g++-mp-4.3"
     47    configure.compiler  macports-gcc-4.3
    4948}
    5049
    5150variant gcc44 description conflicts gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {
    5251    depends_lib-append  port:gcc44
    5352    python.add_archflags   no
    54     build.env CC="${prefix}/bin/gcc-mp-4.4" CXX="${prefix}/bin/g++-mp-4.4"
     53    configure.compiler  macports-gcc-4.4
    5554}
    5655
    5756variant gcc45 description conflicts gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {
    5857    depends_lib-append  port:gcc45
    5958    python.add_archflags   no
    60     build.env CC="${prefix}/bin/gcc-mp-4.5" CXX="${prefix}/bin/g++-mp-4.5"
     59    configure.compiler  macports-gcc-4.5
    6160}
    6261
    6362variant gcc46 description conflicts gcc43 gcc44 gcc45 description {build using macports-gcc-4.6} {
    6463    depends_lib-append  port:gcc46
    6564    python.add_archflags   no
    66     build.env CC="${prefix}/bin/gcc-mp-4.6" CXX="${prefix}/bin/g++-mp-4.6"
     65    configure.compiler  macports-gcc-4.6
    6766}
    6867
     68pre-build {
     69    build.env CC="${configure.cc}" CXX="${configure.cxx}"
     70}
     71
    6972post-destroot {
    7073     file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
    7174     file attributes ${destroot}${prefix}/bin/pymol -permissions a+x