libx264: allow building with yasm

Signed-off-by: Daniel Golle <redacted>

diff --git a/libs/libx264/Makefile b/libs/libx264/Makefile
index 3803808d74402acdd386ee7297ba0778d95d8573..4dc9fec36f7e7281286aa9d57310c94a56ad1c31 100644 (file)
--- a/libs/libx264/Makefile
+++ b/libs/libx264/Makefile
@@ -28,8 +28,14 @@ TARGET_CFLAGS+=-std=gnu99 -fPIC -O3 -ffast-math -I.
 MAKE_FLAGS+= LD="$(TARGET_CC) -o" 
 
 ifneq ($(CONFIG_TARGET_x86),)
+ifeq ($(CONFIG_YASM),y)
   CONFIGURE_VARS+= AS=yasm
   MAKE_FLAGS+= AS=yasm
+else
+  CONFIGURE_VARS+= AS= 
+  MAKE_FLAGS+= AS= 
+  CONFIGURE_ARGS += --disable-asm
+endif
 endif
 
 CONFIGURE_ARGS += \
@@ -45,7 +51,7 @@ define Package/libx264
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=H264/AVC free codec library.
-  DEPENDS:=@BUILD_PATENTED @!TARGET_x86||YASM
+  DEPENDS:=@BUILD_PATENTED
   URL:=http://www.videolan.org/developers/x264.html
 endef