[102101] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Sun Jan 27 21:32:14 PST 2013


Revision: 102101
          https://trac.macports.org/changeset/102101
Author:   jeremyhu at macports.org
Date:     2013-01-27 21:32:14 -0800 (Sun, 27 Jan 2013)
Log Message:
-----------
llvm*: Use compiler.blacklist

Modified Paths:
--------------
    trunk/dports/lang/llvm-2.9/Portfile
    trunk/dports/lang/llvm-3.0/Portfile
    trunk/dports/lang/llvm-3.1/Portfile
    trunk/dports/lang/llvm-3.2/Portfile
    trunk/dports/lang/llvm-3.3/Portfile

Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile	2013-01-28 05:28:38 UTC (rev 102100)
+++ trunk/dports/lang/llvm-2.9/Portfile	2013-01-28 05:32:14 UTC (rev 102101)
@@ -116,14 +116,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 port:ld64 port:cctools
-        depends_skip_archcheck-append apple-gcc42 ld64 cctools
+compiler.blacklist gcc-4.0
 
-        configure.compiler apple-gcc-4.2
-    }
+# 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/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile	2013-01-28 05:28:38 UTC (rev 102100)
+++ trunk/dports/lang/llvm-3.0/Portfile	2013-01-28 05:32:14 UTC (rev 102101)
@@ -115,14 +115,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 port:ld64 port:cctools
-        depends_skip_archcheck-append apple-gcc42 ld64 cctools
+compiler.blacklist gcc-4.0
 
-        configure.compiler apple-gcc-4.2
-    }
+# 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/llvm-3.1/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.1/Portfile	2013-01-28 05:28:38 UTC (rev 102100)
+++ trunk/dports/lang/llvm-3.1/Portfile	2013-01-28 05:32:14 UTC (rev 102101)
@@ -119,14 +119,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 port:ld64 port:cctools
-        depends_skip_archcheck-append apple-gcc42 ld64 cctools
+compiler.blacklist gcc-4.0
 
-        configure.compiler apple-gcc-4.2
-    }
+# 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/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile	2013-01-28 05:28:38 UTC (rev 102100)
+++ trunk/dports/lang/llvm-3.2/Portfile	2013-01-28 05:32:14 UTC (rev 102101)
@@ -119,14 +119,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 port:ld64 port:cctools
-        depends_skip_archcheck-append apple-gcc42 ld64 cctools
+compiler.blacklist gcc-4.0
 
-        configure.compiler apple-gcc-4.2
-    }
+# 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/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile	2013-01-28 05:28:38 UTC (rev 102100)
+++ trunk/dports/lang/llvm-3.3/Portfile	2013-01-28 05:32:14 UTC (rev 102101)
@@ -107,14 +107,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 port:ld64 port:cctools
-        depends_skip_archcheck-append apple-gcc42 ld64 cctools
+compiler.blacklist gcc-4.0
 
-        configure.compiler apple-gcc-4.2
-    }
+# 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 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130127/89a20299/attachment-0001.html>


More information about the macports-changes mailing list