From: Daniel Golle <redacted>
Date: Thu, 22 Sep 2016 22:23:24 +0000 (+0200)
Subject: libx264: fix build on soft-float targets
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ab010288daf751df2fe2e26862546f0dd6effe72;p=openwrt-packages.git

libx264: fix build on soft-float targets

--disable-asm isn't enough to disable building assembly code on ARM.

Signed-off-by: Daniel Golle <redacted>
---

diff --git a/libs/libx264/Makefile b/libs/libx264/Makefile
index 4dc9fec36..7054a4071 100644
--- a/libs/libx264/Makefile
+++ b/libs/libx264/Makefile
@@ -38,15 +38,17 @@ else
 endif
 endif
 
+ifneq ($(CONFIG_SOFT_FLOAT),)
+CONFIGURE_VARS+= AS= 
+MAKE_FLAGS+= AS= 
+CONFIGURE_ARGS += --disable-asm
+endif
+
 CONFIGURE_ARGS += \
 		--enable-shared \
 		--enable-pic \
 		--disable-cli 
 
-ifeq ($(CONFIG_SOFT_FLOAT),y)
-CONFIGURE_ARGS += --disable-asm
-endif
-
 define Package/libx264
   SECTION:=libs
   CATEGORY:=Libraries