[102104] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jan 27 22:04:00 PST 2013
Revision: 102104
https://trac.macports.org/changeset/102104
Author: jeremyhu at macports.org
Date: 2013-01-27 22:04:00 -0800 (Sun, 27 Jan 2013)
Log Message:
-----------
dragonegg*: Use compiler.blacklist
Modified Paths:
--------------
trunk/dports/lang/dragonegg-3.0/Portfile
trunk/dports/lang/dragonegg-3.1/Portfile
trunk/dports/lang/dragonegg-3.2/Portfile
trunk/dports/lang/dragonegg-3.3/Portfile
trunk/dports/lang/ruby/Portfile
Modified: trunk/dports/lang/dragonegg-3.0/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.0/Portfile 2013-01-28 05:54:51 UTC (rev 102103)
+++ trunk/dports/lang/dragonegg-3.0/Portfile 2013-01-28 06:04:00 UTC (rev 102104)
@@ -61,12 +61,12 @@
# g++-4.0 fails to build some of the newer C++ for ppc
# Intel looks ok, but I prefer using gcc-4.2 for consistency
-if {${configure.compiler} == "gcc-4.0"} {
- configure.compiler gcc-4.2
- if {![file exists ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+compiler.blacklist gcc-4.0
+
+# TODO: base should do this: http://trac.macports.org/ticket/32542
+if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+ depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
+ depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
}
variant universal {
Modified: trunk/dports/lang/dragonegg-3.1/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.1/Portfile 2013-01-28 05:54:51 UTC (rev 102103)
+++ trunk/dports/lang/dragonegg-3.1/Portfile 2013-01-28 06:04:00 UTC (rev 102104)
@@ -59,12 +59,12 @@
# g++-4.0 fails to build some of the newer C++ for ppc
# Intel looks ok, but I prefer using gcc-4.2 for consistency
-if {${configure.compiler} == "gcc-4.0"} {
- configure.compiler gcc-4.2
- if {![file exists ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+compiler.blacklist gcc-4.0
+
+# TODO: base should do this: http://trac.macports.org/ticket/32542
+if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+ depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
+ depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
}
patchfiles missing-includes.patch cstring.patch
Modified: trunk/dports/lang/dragonegg-3.2/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.2/Portfile 2013-01-28 05:54:51 UTC (rev 102103)
+++ trunk/dports/lang/dragonegg-3.2/Portfile 2013-01-28 06:04:00 UTC (rev 102104)
@@ -58,12 +58,12 @@
# g++-4.0 fails to build some of the newer C++ for ppc
# Intel looks ok, but I prefer using gcc-4.2 for consistency
-if {${configure.compiler} == "gcc-4.0"} {
- configure.compiler gcc-4.2
- if {![file exists ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+compiler.blacklist gcc-4.0
+
+# TODO: base should do this: http://trac.macports.org/ticket/32542
+if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+ depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
+ depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
}
patchfiles missing-includes.patch
Modified: trunk/dports/lang/dragonegg-3.3/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.3/Portfile 2013-01-28 05:54:51 UTC (rev 102103)
+++ trunk/dports/lang/dragonegg-3.3/Portfile 2013-01-28 06:04:00 UTC (rev 102104)
@@ -58,12 +58,12 @@
# g++-4.0 fails to build some of the newer C++ for ppc
# Intel looks ok, but I prefer using gcc-4.2 for consistency
-if {${configure.compiler} == "gcc-4.0"} {
- configure.compiler gcc-4.2
- if {![file exists ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+compiler.blacklist gcc-4.0
+
+# TODO: base should do this: http://trac.macports.org/ticket/32542
+if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+ depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
+ depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
}
patchfiles missing-includes.patch
Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile 2013-01-28 05:54:51 UTC (rev 102103)
+++ trunk/dports/lang/ruby/Portfile 2013-01-28 06:04:00 UTC (rev 102104)
@@ -2,6 +2,7 @@
PortSystem 1.0
PortGroup muniversal 1.0
+PortGroup compiler_blacklist_versions 1.0
name ruby
version 1.8.7-p371
@@ -70,20 +71,19 @@
# [NG] llvm-gcc-4.2
# clang (Xcode 4.1 or earlier)
# clang (Xcode 4.2 or later) with -O[12]
-if {${configure.compiler} == "llvm-gcc-4.2"} {
- configure.compiler gcc-4.2
-} elseif {${configure.compiler} == "clang"} {
- if {[vercmp ${xcodeversion} 4.2] >= 0} {
- configure.optflags -Os
- } else {
- depends_build-append port:apple-gcc42
- depends_skip_archcheck-append apple-gcc42
- configure.compiler apple-gcc-4.2
- # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
- configure.cxx ${prefix}/bin/g++-apple-4.2
- }
+# TODO: When was this last verified? Is there a ticket open? Radar?
+compiler.blacklist-append llvm-gcc-4.2 macports-llvm-gcc-4.2 {clang < 211}
+
+# TODO: base should do this: http://trac.macports.org/ticket/32542
+if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+ depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
+ depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
}
+if {[string match *clang* ${configure.compiler}]} {
+ configure.optflags -Os
+}
+
configure.args --enable-shared \
--mandir="${prefix}/share/man" \
--enable-pthread \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130127/cad68ed8/attachment.html>
More information about the macports-changes
mailing list