[102296] trunk/dports/lang/chicken
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jan 30 00:29:16 PST 2013
Revision: 102296
https://trac.macports.org/changeset/102296
Author: jeremyhu at macports.org
Date: 2013-01-30 00:29:16 -0800 (Wed, 30 Jan 2013)
Log Message:
-----------
chicken: Convert to using compiler.whitelist and the dependency workaround block. I also added a small patch to remove some clang warnings in case someone decides to start looking at this issue...
Modified Paths:
--------------
trunk/dports/lang/chicken/Portfile
Added Paths:
-----------
trunk/dports/lang/chicken/files/clang.patch
Modified: trunk/dports/lang/chicken/Portfile
===================================================================
--- trunk/dports/lang/chicken/Portfile 2013-01-30 08:08:42 UTC (rev 102295)
+++ trunk/dports/lang/chicken/Portfile 2013-01-30 08:29:16 UTC (rev 102296)
@@ -24,7 +24,8 @@
rmd160 421f6e7383a666b836a7ad9d5ac342c8033bfff6
patchfiles patch-Makefile.macosx \
- eval.c.patch
+ eval.c.patch \
+ clang.patch
post-patch {
# use full path with dlopen (#28617)
@@ -35,17 +36,25 @@
reinplace "s|031__PREFIX__|[format %03o $len]${prefix}|" ${worksrcpath}/eval.c
}
-# hangs when built with llvm, ticket #32298
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
- configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
+# https://trac.macports.org/ticket/32298
+compiler.whitelist-append gcc-4.2 apple-gcc-4.2 gcc-4.0
+
+# TODO: base should do this: http://trac.macports.org/ticket/32542
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
+ depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
+
+ # base 2.1.x ignores the argument and just use ${configure.compiler}
+ if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
+ depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
}
+
+ if {[string match macports-gcc* ${configure.compiler}]} {
+ depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
+ }
}
use_configure no
+use_parallel_build no
build.args C_COMPILER=${configure.cc} \
PLATFORM=macosx \
Added: trunk/dports/lang/chicken/files/clang.patch
===================================================================
--- trunk/dports/lang/chicken/files/clang.patch (rev 0)
+++ trunk/dports/lang/chicken/files/clang.patch 2013-01-30 08:29:16 UTC (rev 102296)
@@ -0,0 +1,15 @@
+--- chicken.h.orig 2013-01-30 00:22:08.000000000 -0800
++++ chicken.h 2013-01-30 00:22:10.000000000 -0800
+@@ -226,11 +226,7 @@ void *alloca ();
+ # ifndef __cplusplus
+ # define C_cblock ({
+ # define C_cblockend })
+-# ifdef __clang__
+-# define C_noret
+-# else
+-# define C_noret __attribute__ ((noreturn))
+-# endif
++# define C_noret __attribute__ ((noreturn))
+ # define C_noret_decl(name)
+ # define C_aligned __attribute__ ((aligned))
+ # endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130130/ebc48075/attachment.html>
More information about the macports-changes
mailing list