From ab010288daf751df2fe2e26862546f0dd6effe72 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 23 Sep 2016 00:23:24 +0200 Subject: [PATCH 1/2] libx264: fix build on soft-float targets --disable-asm isn't enough to disable building assembly code on ARM. Signed-off-by: Daniel Golle --- libs/libx264/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 From 71160d214a86d52325a9118cb022e4d073102a8e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 23 Sep 2016 00:45:36 +0200 Subject: [PATCH 2/2] libx264: mark as broken on powerpc Signed-off-by: Daniel Golle --- libs/libx264/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libx264/Makefile b/libs/libx264/Makefile index 7054a4071..808a02ce3 100644 --- a/libs/libx264/Makefile +++ b/libs/libx264/Makefile @@ -53,7 +53,7 @@ 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