Merge pull request #3082 from thess/libx264-merge
libx264: Fix build errors on x86 targets due to missing ASM features …
This commit is contained in:
commit
d875334e5e
|
@ -24,9 +24,14 @@ PKG_INSTALL:=1
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
TARGET_CFLAGS:=-Wno-maybe-uninitialized -Wshadow -Wall -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"
|
||||||
|
|
||||||
|
ifneq ($(CONFIG_TARGET_x86),)
|
||||||
|
CONFIGURE_VARS+= AS=yasm
|
||||||
|
MAKE_FLAGS+= AS=yasm
|
||||||
|
endif
|
||||||
|
|
||||||
CONFIGURE_ARGS += \
|
CONFIGURE_ARGS += \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--enable-pic \
|
--enable-pic \
|
||||||
|
@ -40,7 +45,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:=@BUILD_PATENTED @!TARGET_x86||YASM
|
||||||
URL:=http://www.videolan.org/developers/x264.html
|
URL:=http://www.videolan.org/developers/x264.html
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue