[93718] trunk/dports/multimedia/ffmpeg/Portfile

[jeremyhu at macports.org]

Revision: 93718
          https://trac.macports.org/changeset/93718
Author:   jeremyhu at macports.org
Date:     2012-05-28 20:16:05 -0700 (Mon, 28 May 2012)
Log Message:
-----------
ffmpeg: Don't use buggy clang for i386 (#30137)

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2012-05-29 03:14:25 UTC (rev 93717)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2012-05-29 03:16:05 UTC (rev 93718)
@@ -79,6 +79,8 @@
 build.cmd       ${prefix}/bin/gmake
 build.env-append V=1
 
+variant universal {}
+
 #
 # enable auto configure of mmx and related Intel optimizations by default
 # requires Xcode 3.1 or better on Leopard
@@ -100,12 +102,12 @@
     configure.compiler clang
 }
 
-# Xcode 4.1's clang has issues with ffmpeg
-# See https://trac.macports.org/ticket/30137
-if {$xcodeversion == "4.1"} {
-    pre-configure {
-        error "XCode 4.1 cannot compile ${name}; please upgrade"
-    }
+# Newer clang hit https://trac.macports.org/ticket/30137 (<rdar://problem/11542429>)
+if {${configure.compiler} == "clang" && [vercmp ${xcodeversion} 4.1] >= 0 && [lsearch [get_canonical_archs] i386] != -1} {
+    depends_build-append port:clang-3.0
+    depends_skip_archcheck-append clang-3.0
+
+    configure.compiler macports-clang-3.0
 }
 
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120528/129bb13d/attachment.html>