Ticket #35845: Portfile.diff

File Portfile.diff, 2.1 KB (added by kjellpk (Kjell Konis), 12 years ago)
  • Portfile

    old new  
    99name                        R-framework
    1010conflicts                   R
    1111version                     ${major}.${minor}.${point}
     12revision                    1
    1213categories                  math science
    1314maintainers                 me.com:kjell.konis
    1415license                     {GPL-2 GPL-3}
     
    103104    depends_lib-append      port:gcc45
    104105    configure.compiler      macports-gcc-4.5
    105106    configure.objc          /usr/bin/gcc
    106     configure.env-append    "OBJCXX=${configure.objc}"
    107107}
    108108
    109109variant gcc46 conflicts gcc45 gcc47 llvm_gcc42 description {build with gcc46} {
    110110    depends_lib-append      port:gcc46
    111111    configure.compiler      macports-gcc-4.6
    112112    configure.objc          /usr/bin/gcc
    113     configure.env-append    "OBJCXX=${configure.objc}"
    114113}
    115114
    116115variant gcc47 conflicts gcc45 gcc46 llvm_gcc42 description {build with gcc47} {
    117116    depends_lib-append      port:gcc47
    118117    configure.compiler      macports-gcc-4.7
    119118    configure.objc          /usr/bin/gcc
    120     configure.env-append    "OBJCXX=${configure.objc}"
    121119}
    122120
    123121variant llvm_gcc42 conflicts gcc45 gcc46 gcc47 description {build with llvm-gcc42} {
     
    159157                            --x-lib=${prefix}/lib
    160158}
    161159
    162 default_variants +cairo +recommended +tcltk +x11
     160default_variants +cairo +recommended +x11
    163161
    164162if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset builtin_lapack]} {
    165163    default_variants-append +accelerate
     
    184182
    185183    reinplace "s|R_ARCH=/`arch`|R_ARCH=/${build_arch}|" "${destroot}${resources}/bin/R"
    186184    reinplace "s|-F${destroot}|-F|" "${destroot}${resources}/etc/${build_arch}/Makeconf"
     185    reinplace "s|OBJCXX = |OBJCXX = /usr/bin/g++|" "${destroot}${resources}/etc/${build_arch}/Makeconf"
     186    reinplace "s|OBJC_LIBS = none |OBJC_LIBS = -lobjc |" "${destroot}${resources}/etc/${build_arch}/Makeconf"
    187187
    188188    file delete ${destroot}${resources}/lib/libR.dylib
    189189    file delete ${destroot}${resources}/lib/libRblas.dylib