Revision: 80099 http://trac.macports.org/changeset/80099 Author: jeremyhu@macports.org Date: 2011-07-04 02:26:44 -0700 (Mon, 04 Jul 2011) Log Message: ----------- libsdl: Fallback on gcc-4.2 based on selected compiler rather than platform Modified Paths: -------------- trunk/dports/devel/libsdl/Portfile Modified: trunk/dports/devel/libsdl/Portfile =================================================================== --- trunk/dports/devel/libsdl/Portfile 2011-07-04 09:25:03 UTC (rev 80098) +++ trunk/dports/devel/libsdl/Portfile 2011-07-04 09:26:44 UTC (rev 80099) @@ -41,7 +41,7 @@ --disable-nasm \ --without-x -variant x11 conflicts no_x11 description {Enable support for X11} { +variant x11 conflicts no_x11 { configure.args-delete --without-x configure.args-append --x-include=${prefix}/include \ --x-lib=${prefix}/lib @@ -57,7 +57,7 @@ } } } -variant no_x11 conflicts x11 description {Legacy compatibility variant} {} +variant no_x11 conflicts x11 {} if {[variant_isset no_x11]} { default_variants -x11 } else { @@ -88,11 +88,12 @@ } } -platform darwin 11 { - # BUILD FIX TODO: - # llvm-gcc-4.2 and clang fail to build as of 2011.06.15 - # This looks like an error in the package. - configure.compiler gcc-4.2 +# BUILD FIX TODO: +# llvm-gcc-4.2 and clang fail to build as of 2011.06.15 +# This looks like an error in the package. +if {${configure.compiler} == "llvm-gcc-4.2" || + ${configure.compiler} == "clang"} { + configure.compiler gcc-4.2 } livecheck.type regex