Modified: trunk/dports/multimedia/x264/Portfile (117591 => 117592)

--- trunk/dports/multimedia/x264/Portfile	2014-03-04 16:26:09 UTC (rev 117591)
+++ trunk/dports/multimedia/x264/Portfile	2014-03-04 18:36:00 UTC (rev 117592)
@@ -83,8 +83,10 @@
 
 # as of this build (142) +asm is believed to work with 64-bit Intel Snow Leopard and up including Mavericks
 # please file a ticket if you have evidence to the contrary
+# i386 clang build issues remain which break +asm +universal. Mark +asm conflicting with +universal.
+# see https://mailman.videolan.org/pipermail/x264-devel/2014-February/010371.html, #42672.
 
-variant asm description {enable intel assembler optimizations} {
+variant asm conflicts universal description {enable intel assembler optimizations} {
         depends_build-append    port:yasm
         configure.args-delete   --disable-asm
 }