commit 4da62bfbcfe30731a1b2621f316ad25980a09652
parent 82a482e92a7be63371e0e4b233c8f33723e4118b
Author: Ted Hess <thess@kitschensync.net>
Date: Sat, 24 Sep 2016 14:22:51 -0400
Merge pull request #3210 from dangowrt/fix-x264-build
libx264: Fix x264 build (asm)
Diffstat:
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/libs/libx264/Makefile b/libs/libx264/Makefile
@@ -38,20 +38,22 @@ 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
TITLE:=H264/AVC free codec library.
- DEPENDS:=@BUILD_PATENTED
+ DEPENDS:=@BUILD_PATENTED @!powerpc||BROKEN
URL:=http://www.videolan.org/developers/x264.html
endef