Revision: 80140 http://trac.macports.org/changeset/80140 Author: jeremyhu@macports.org Date: 2011-07-05 00:15:17 -0700 (Tue, 05 Jul 2011) Log Message: ----------- libcaca: Fix build with clang and fall back on clang from llvm-gcc-4.2 Modified Paths: -------------- trunk/dports/graphics/libcaca/Portfile Added Paths: ----------- trunk/dports/graphics/libcaca/files/ trunk/dports/graphics/libcaca/files/alias.patch Modified: trunk/dports/graphics/libcaca/Portfile =================================================================== --- trunk/dports/graphics/libcaca/Portfile 2011-07-05 07:04:50 UTC (rev 80139) +++ trunk/dports/graphics/libcaca/Portfile 2011-07-05 07:15:17 UTC (rev 80140) @@ -23,6 +23,8 @@ sha1 24cdb9fb7dc4a01be2787a9009304fad419f79db \ rmd160 86a4d86ced5a9fcf0eddfbd4f86268a68d49bca9 +# http://caca.zoy.org/ticket/90 +patchfiles alias.patch configure.args --mandir=${prefix}/share/man \ --disable-win32 --disable-conio --disable-slang \ @@ -38,12 +40,8 @@ --x-libraries=${prefix}/lib } -# BUILD FIX TODO: -# llvm-gcc-4.2 and clang fail to build as of 2011.06.16 -# This looks like an error in the package. -if {${configure.compiler} == "llvm-gcc-4.2" || - ${configure.compiler} == "clang"} { - configure.compiler gcc-4.2 +if {${configure.compiler} == "llvm-gcc-4.2"} { + configure.compiler clang } livecheck.type regex Added: trunk/dports/graphics/libcaca/files/alias.patch =================================================================== --- trunk/dports/graphics/libcaca/files/alias.patch (rev 0) +++ trunk/dports/graphics/libcaca/files/alias.patch 2011-07-05 07:15:17 UTC (rev 80140) @@ -0,0 +1,11 @@ +--- caca/caca.h.orig 2011-07-05 00:09:51.000000000 -0700 ++++ caca/caca.h 2011-07-05 00:10:10.000000000 -0700 +@@ -645,7 +645,7 @@ typedef struct cucul_buffer cucul_buffer + # define CACA_DEPRECATED + # endif + +-# if defined __GNUC__ && __GNUC__ > 3 ++# if !defined __APPLE__ && defined __GNUC__ && __GNUC__ > 3 + # define CACA_ALIAS(x) __attribute__ ((weak, alias(#x))) + # else + # define CACA_ALIAS(x)