openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 21:24:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

libx264: more build fixes

Browse Source 
Introduce blacklist for CPU_TYPEs without ASM support in libx264
Add libpthread dependency required on non-musl builds

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2016-09-26 09:42:19 +02:00
parent 6131f24861
commit 4c58f29d4d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/libx264/Makefile
View File

@@ -27,6 +27,9 @@ include $(INCLUDE_DIR)/package.mk
TARGET_CFLAGS+=-std=gnu99 -fPIC -O3 -ffast-math -I. TARGET_CFLAGS+=-std=gnu99 -fPIC -O3 -ffast-math -I.
MAKE_FLAGS+= LD="$(TARGET_CC) -o" MAKE_FLAGS+= LD="$(TARGET_CC) -o"
# ARM ASM depends on ARM1156 or later, blacklist earlier or incompatible cores
CPU_ASM_BLACKLIST:=arm920t arm926ej-s arm1136j-s arm1176jzf-s fa526 mpcore xscale
ifneq ($(CONFIG_TARGET_x86),) ifneq ($(CONFIG_TARGET_x86),)
ifeq ($(CONFIG_YASM),y) ifeq ($(CONFIG_YASM),y)
CONFIGURE_VARS+= AS=yasm CONFIGURE_VARS+= AS=yasm
@@ -38,7 +41,7 @@ else
endif endif
endif endif
ifneq ($(CONFIG_SOFT_FLOAT),) ifneq ($(CONFIG_SOFT_FLOAT)$(findstring $(CONFIG_CPU_TYPE),$(CPU_ASM_BLACKLIST)),)
CONFIGURE_VARS+= AS= CONFIGURE_VARS+= AS=
MAKE_FLAGS+= AS= MAKE_FLAGS+= AS=
CONFIGURE_ARGS += --disable-asm CONFIGURE_ARGS += --disable-asm
@@ -53,7 +56,7 @@ define Package/libx264
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=H264/AVC free codec library. TITLE:=H264/AVC free codec library.
DEPENDS:=@BUILD_PATENTED DEPENDS:=+libpthread @BUILD_PATENTED
URL:=http://www.videolan.org/developers/x264.html URL:=http://www.videolan.org/developers/x264.html
endef endef