[102113] trunk/dports/multimedia

jeremyhu at macports.org jeremyhu at macports.org
Sun Jan 27 23:14:19 PST 2013


Revision: 102113
          https://trac.macports.org/changeset/102113
Author:   jeremyhu at macports.org
Date:     2013-01-27 23:14:19 -0800 (Sun, 27 Jan 2013)
Log Message:
-----------
VLC*: Use compiler.blacklist

Modified Paths:
--------------
    trunk/dports/multimedia/VLC/Portfile
    trunk/dports/multimedia/VLC-devel/Portfile

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2013-01-28 07:12:04 UTC (rev 102112)
+++ trunk/dports/multimedia/VLC/Portfile	2013-01-28 07:14:19 UTC (rev 102113)
@@ -88,20 +88,15 @@
 # live555 and possibly others are not universal, so disabling for now
 universal_variant   no
 
-platform darwin i386 {
-    # Older gcc fail at register allocation
-    if {[string match "*gcc*" ${configure.compiler}] && ![string match "*llvm*" ${configure.compiler}]} {
-        configure.compiler clang
-        if {![file exists ${configure.cc}]} {
-            depends_build-append port:clang-3.0
-            depends_skip_archcheck-append clang-3.0
+# Older gcc fail at register allocation
+if {${build_arch} == "i386" || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1)} {
+    compiler.blacklist gcc-4.0 gcc-4.2 llvm-gcc-4.2
+}
 
-            #configure.compiler macports-clang-3.0
-            configure.cc ${prefix}/bin/clang-mp-3.0
-            configure.objc ${prefix}/bin/clang-mp-3.0
-            configure.cxx ${prefix}/bin/clang++-mp-3.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})
+    depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
 }
 
 # Other

Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile	2013-01-28 07:12:04 UTC (rev 102112)
+++ trunk/dports/multimedia/VLC-devel/Portfile	2013-01-28 07:14:19 UTC (rev 102113)
@@ -96,20 +96,15 @@
 # live555 and possibly others are not universal, so disabling for now
 universal_variant   no
 
-platform darwin i386 {
-    # Older gcc fail at register allocation
-    if {[string match "*gcc*" ${configure.compiler}] && ![string match "*llvm*" ${configure.compiler}]} {
-        configure.compiler clang
-        if {![file exists ${configure.cc}]} {
-            depends_build-append port:clang-3.0
-            depends_skip_archcheck-append clang-3.0
+# Older gcc fail at register allocation
+if {${build_arch} == "i386" || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1)} {
+    compiler.blacklist gcc-4.0 gcc-4.2 llvm-gcc-4.2
+}
 
-            #configure.compiler macports-clang-3.0
-            configure.cc ${prefix}/bin/clang-mp-3.0
-            configure.objc ${prefix}/bin/clang-mp-3.0
-            configure.cxx ${prefix}/bin/clang++-mp-3.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})
+    depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
 }
 
 # Other
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130127/c2a84f6a/attachment.html>


More information about the macports-changes mailing list