[SCM] x264/master: Pass --disable-asm while building on mips, mipsel, mips64el

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1a3e901dc008eae102d140770fe2912bd65ca31e
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Oct 21 12:26:47 2015 +0200

    Pass --disable-asm while building on mips, mipsel, mips64el

diff --git a/debian/confflags b/debian/confflags
index 88e1cf7..96be555 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -123,10 +123,13 @@ ifeq (yes,$(HAVEGCC4.8))
 common_confflags += --extra-cflags=-fno-aggressive-loop-optimizations
 endif
 
-# MIPS upstream arch, mips and mipsel Debian arches; no upstream flags by
+# MIPS upstream arch, mips, mipsel and mips64el Debian arches; no upstream flags by
 # default
-#ifneq (,$(filter mips mipsel,$(DEB_HOST_GNU_CPU)))
-#endif
+ifneq (,$(filter mips mipsel mips64el,$(DEB_HOST_GNU_CPU)))
+shared_confflags += --disable-asm
+static_confflags += --disable-asm
+opt_confflags += --disable-asm
+endif
 
 # ARM upsteam arch, arm, armeb, and armel Debian arches; upstream prepends -O3
 # -fno-fast-math by default, but that's ok as we override -O and we don't care

-- 
x264 packaging