Revision: 90090 http://trac.macports.org/changeset/90090 Author: adfernandes@macports.org Date: 2012-02-21 08:01:15 -0800 (Tue, 21 Feb 2012) Log Message: ----------- math/R-framework: add gcc46 patch for #33006 Modified Paths: -------------- trunk/dports/math/R-framework/Portfile Modified: trunk/dports/math/R-framework/Portfile =================================================================== --- trunk/dports/math/R-framework/Portfile 2012-02-21 16:00:16 UTC (rev 90089) +++ trunk/dports/math/R-framework/Portfile 2012-02-21 16:01:15 UTC (rev 90090) @@ -39,8 +39,7 @@ depends_build port:pkgconfig -depends_lib port:llvm-gcc42 \ - port:readline \ +depends_lib port:readline \ port:icu \ port:libiconv @@ -54,9 +53,6 @@ configure.env-append r_arch=${build_arch} -configure.compiler macports-llvm-gcc-4.2 -configure.ldflags-append -L${prefix}/lib/llvm-gcc42 -lgfortran - configure.pre_args --prefix=${frameworks_dir} configure.args --enable-R-framework \ @@ -91,6 +87,19 @@ configure.optflags-append -g } +variant gcc46 description {build with gcc46} { + depends_lib-append port:gcc46 + configure.compiler macports-gcc-4.6 + configure.objc /usr/bin/clang + configure.env-append "OBJCXX=${configure.objc}" +} + +variant llvm-gcc42 conflicts gcc46 description {build with llvm-gcc42} { + depends_lib-append port:llvm-gcc42 + configure.compiler macports-llvm-gcc-4.2 + configure.ldflags-append -L${prefix}/lib/llvm-gcc42 -lgfortran +} + variant recommended description {Install recommended R packages} { configure.args-delete --without-recommended-packages configure.args-append --with-recommended-packages @@ -126,6 +135,10 @@ default_variants +cairo +recommended +tcltk +x11 +if {![variant_isset gcc46] && ![variant_isset llvm-gcc42]} { + default_variants-append +llvm-gcc42 +} + destroot.destdir prefix=${destroot}${frameworks_dir} post-destroot {