Ticket #33006: Portfile.2.diff
File Portfile.2.diff, 1.7 KB (added by kjell.konis@…, 13 years ago) |
---|
-
Portfile
old new 39 39 40 40 depends_build port:pkgconfig 41 41 42 depends_lib port:llvm-gcc42 \ 43 port:readline \ 42 depends_lib port:readline \ 44 43 port:icu \ 45 44 port:libiconv 46 45 … … 54 53 55 54 configure.env-append r_arch=${build_arch} 56 55 57 configure.compiler macports-llvm-gcc-4.258 configure.ldflags-append -L${prefix}/lib/llvm-gcc42 -lgfortran59 60 56 configure.pre_args --prefix=${frameworks_dir} 61 57 62 58 configure.args --enable-R-framework \ … … 91 87 configure.optflags-append -g 92 88 } 93 89 90 variant gcc46 description {build with gcc46} { 91 depends_lib-append port:gcc46 92 configure.compiler macports-gcc-4.6 93 configure.objc /usr/bin/clang 94 configure.env-append "OBJCXX=${configure.objc}" 95 } 96 97 variant llvm-gcc42 conflicts gcc46 description {build with llvm-gcc42} { 98 depends_lib-append port:llvm-gcc42 99 configure.compiler macports-llvm-gcc-4.2 100 configure.ldflags-append -L${prefix}/lib/llvm-gcc42 -lgfortran 101 } 102 94 103 variant recommended description {Install recommended R packages} { 95 104 configure.args-delete --without-recommended-packages 96 105 configure.args-append --with-recommended-packages … … 126 135 127 136 default_variants +cairo +recommended +tcltk +x11 128 137 138 if {![variant_isset gcc46] && ![variant_isset llvm-gcc42]} { 139 default_variants-append +llvm-gcc42 140 } 141 129 142 destroot.destdir prefix=${destroot}${frameworks_dir} 130 143 131 144 post-destroot {